From 72dbab3d84ec2c1c35d899256afe4bea470fe72a Mon Sep 17 00:00:00 2001
From: Horis <8674809+821938089@users.noreply.github.com>
Date: Sat, 1 Mar 2025 14:11:48 +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

---
 .../main/java/io/legado/app/model/localBook/EpubFile.kt   | 8 ++++----
 .../legado/app/ui/book/import/local/ImportBookActivity.kt | 3 +--
 .../java/io/legado/app/ui/book/read/ReadBookActivity.kt   | 2 --
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt b/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt
index 065b1e91c..83802b9e4 100644
--- a/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt
+++ b/app/src/main/java/io/legado/app/model/localBook/EpubFile.kt
@@ -290,12 +290,12 @@ class EpubFile(var book: Book) {
                 book.name = book.originName.replace(".epub", "")
             }
 
-            if (metadata.authors.size > 0) {
+            if (metadata.authors.isNotEmpty()) {
                 val author =
                     metadata.authors[0].toString().replace("^, |, $".toRegex(), "")
                 book.author = author
             }
-            if (metadata.descriptions.size > 0) {
+            if (metadata.descriptions.isNotEmpty()) {
                 val desc = metadata.descriptions[0]
                 book.intro = if (desc.isXml()) {
                     Jsoup.parse(metadata.descriptions[0]).text()
@@ -323,7 +323,7 @@ class EpubFile(var book: Book) {
                             val doc =
                                 Jsoup.parse(String(resource.data, mCharset))
                             val elements = doc.getElementsByTag("title")
-                            if (elements.size > 0) {
+                            if (elements.isNotEmpty()) {
                                 title = elements[0].text()
                             }
                         } catch (e: IOException) {
@@ -385,7 +385,7 @@ class EpubFile(var book: Book) {
                     String(epubBook!!.resources.getByHref(content.href).data, mCharset)
                 ).getElementsByTag("title")
                 title =
-                    if (elements.size > 0 && elements[0].text().isNotBlank())
+                    if (elements.isNotEmpty() && elements[0].text().isNotBlank())
                         elements[0].text()
                     else
                         "--卷首--"
diff --git a/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt
index d20deb595..52e376b4d 100644
--- a/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/import/local/ImportBookActivity.kt
@@ -15,7 +15,6 @@ import io.legado.app.R
 import io.legado.app.constant.PreferKey
 import io.legado.app.data.appDb
 import io.legado.app.databinding.DialogEditTextBinding
-import io.legado.app.help.book.update
 import io.legado.app.help.config.AppConfig
 import io.legado.app.lib.dialogs.alert
 import io.legado.app.lib.permission.Permissions
@@ -308,7 +307,7 @@ class ImportBookActivity : BaseImportBookActivity<ImportBookViewModel>(),
                 val filePath = fileDoc.toString()
                 if (it.bookUrl != filePath) {
                     it.bookUrl = filePath
-                    it.update()
+                    appDb.bookDao.insert(it)
                 }
                 startReadBook(it)
             }
diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
index daf3aa755..df0cac6e4 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt
@@ -168,14 +168,12 @@ class ReadBookActivity : BaseReadBookActivity(),
         }
     private val replaceActivity =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            it ?: return@registerForActivityResult
             if (it.resultCode == RESULT_OK) {
                 viewModel.replaceRuleChanged()
             }
         }
     private val searchContentActivity =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-            it ?: return@registerForActivityResult
             it.data?.let { data ->
                 val key = data.getLongExtra("key", System.currentTimeMillis())
                 val index = data.getIntExtra("index", 0)