From a7c3970345114a0101b9085f23c212134e4b45be Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Tue, 6 May 2025 20:31:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/ui/book/source/edit/BookSourceEditActivity.kt      | 7 ++++++-
 .../legado/app/ui/rss/source/edit/RssSourceEditActivity.kt | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt
index 0f9760e1d..e320f3ff3 100644
--- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt
@@ -1,6 +1,5 @@
 package io.legado.app.ui.book.source.edit
 
-import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
@@ -388,6 +387,7 @@ class BookSourceEditActivity :
         val contentRule = ContentRule()
 //        val reviewRule = ReviewRule()
         sourceEntities.forEach {
+            it.value = it.value?.takeIf { s -> s.isNotBlank() }
             when (it.key) {
                 "bookSourceUrl" -> source.bookSourceUrl = it.value ?: ""
                 "bookSourceName" -> source.bookSourceName = it.value ?: ""
@@ -405,6 +405,7 @@ class BookSourceEditActivity :
             }
         }
         searchEntities.forEach {
+            it.value = it.value?.takeIf { s -> s.isNotBlank() }
             when (it.key) {
                 "searchUrl" -> source.searchUrl = it.value
                 "checkKeyWord" -> searchRule.checkKeyWord = it.value
@@ -438,6 +439,7 @@ class BookSourceEditActivity :
             }
         }
         exploreEntities.forEach {
+            it.value = it.value?.takeIf { s -> s.isNotBlank() }
             when (it.key) {
                 "exploreUrl" -> source.exploreUrl = it.value
                 "bookList" -> exploreRule.bookList = it.value
@@ -470,6 +472,7 @@ class BookSourceEditActivity :
             }
         }
         infoEntities.forEach {
+            it.value = it.value?.takeIf { s -> s.isNotBlank() }
             when (it.key) {
                 "init" -> bookInfoRule.init = it.value
                 "name" -> bookInfoRule.name = viewModel.ruleComplete(it.value, bookInfoRule.init)
@@ -503,6 +506,7 @@ class BookSourceEditActivity :
             }
         }
         tocEntities.forEach {
+            it.value = it.value?.takeIf { s -> s.isNotBlank() }
             when (it.key) {
                 "preUpdateJs" -> tocRule.preUpdateJs = it.value
                 "chapterList" -> tocRule.chapterList = it.value
@@ -522,6 +526,7 @@ class BookSourceEditActivity :
             }
         }
         contentEntities.forEach {
+            it.value = it.value?.takeIf { s -> s.isNotBlank() }
             when (it.key) {
                 "content" -> contentRule.content = viewModel.ruleComplete(it.value)
                 "title" -> contentRule.title = viewModel.ruleComplete(it.value)
diff --git a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt
index 2762fb35e..83c4a9bec 100644
--- a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt
@@ -281,6 +281,7 @@ class RssSourceEditActivity :
         source.singleUrl = binding.cbSingleUrl.isChecked
         source.enabledCookieJar = binding.cbIsEnableCookie.isChecked
         sourceEntities.forEach {
+            it.value = it.value?.takeIf { s -> s.isNotBlank() }
             when (it.key) {
                 "sourceName" -> source.sourceName = it.value ?: ""
                 "sourceUrl" -> source.sourceUrl = it.value ?: ""
@@ -299,6 +300,7 @@ class RssSourceEditActivity :
             }
         }
         listEntities.forEach {
+            it.value = it.value?.takeIf { s -> s.isNotBlank() }
             when (it.key) {
                 "ruleArticles" -> source.ruleArticles = it.value
                 "ruleNextPage" -> source.ruleNextPage =
@@ -321,6 +323,7 @@ class RssSourceEditActivity :
             }
         }
         webViewEntities.forEach {
+            it.value = it.value?.takeIf { s -> s.isNotBlank() }
             when (it.key) {
                 "enableJs" -> source.enableJs = it.value.isTrue()
                 "loadWithBaseUrl" -> source.loadWithBaseUrl = it.value.isTrue()