From d21573f6a5410d1f960dd332efdd79a4eadc2ef4 Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Tue, 7 Mar 2023 17:17:37 +0800
Subject: [PATCH] fix

---
 .../java/io/legado/app/constant/EventBus.kt    |  1 -
 .../app/ui/book/info/BookInfoActivity.kt       |  6 ------
 .../app/ui/book/info/BookInfoViewModel.kt      | 18 ++++++++----------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/io/legado/app/constant/EventBus.kt b/app/src/main/java/io/legado/app/constant/EventBus.kt
index 1d9b3e9e1..56bd2f97e 100644
--- a/app/src/main/java/io/legado/app/constant/EventBus.kt
+++ b/app/src/main/java/io/legado/app/constant/EventBus.kt
@@ -27,7 +27,6 @@ object EventBus {
     const val TIP_COLOR = "tipColor"
     const val SOURCE_CHANGED = "sourceChanged"
     const val SEARCH_RESULT = "searchResult"
-    const val FILE_SOURCE_DOWNLOAD_DONE = "fileSourceDownloadDone"
     const val UPDATE_READ_ACTION_BAR = "updateReadActionBar"
     const val UP_SEEK_BAR = "upSeekBar"
     const val READ_ALOUD_PLAY = "readAloudPlay"
diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
index b22f7b267..aba1b93e3 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
@@ -11,7 +11,6 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.activity.viewModels
 import io.legado.app.R
 import io.legado.app.base.VMBaseActivity
-import io.legado.app.constant.EventBus
 import io.legado.app.constant.Theme
 import io.legado.app.data.appDb
 import io.legado.app.data.entities.Book
@@ -587,9 +586,4 @@ class BookInfoActivity :
         }
     }
 
-    override fun observeLiveBus() {
-        observeEvent<String>(EventBus.FILE_SOURCE_DOWNLOAD_DONE) {
-            viewModel.changeToLocalBook(it)
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
index 73e5fd9c0..5d009847d 100644
--- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
@@ -189,8 +189,6 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
                     appDb.bookChapterDao.insert(*it.toTypedArray())
                     chapterListData.postValue(it)
                 }
-            } else if (book.isWebFile) {
-                chapterListData.postValue(emptyList())
             } else {
                 bookSource?.let { bookSource ->
                     val oldBook = book.copy()
@@ -276,7 +274,9 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
        bookSource ?: return
        execute {
            if (webFile.isSupported) {
-               LocalBook.importFileOnLine(webFile.url, webFile.name, bookSource)
+               LocalBook.importFileOnLine(webFile.url, webFile.name, bookSource).let {
+                   changeToLocalBook(it)
+               }
            } else {
                LocalBook.saveBookFile(webFile.url, webFile.name, bookSource)
            }
@@ -401,13 +401,11 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
         }
     }
 
-    fun changeToLocalBook(bookUrl: String) {
-        appDb.bookDao.getBook(bookUrl)?.let { localBook ->
-            inBookshelf = true
-            LocalBook.mergeBook(localBook, bookData.value).let {
-                bookData.postValue(it)
-                loadChapter(it)
-            }
+    private fun changeToLocalBook(localBook: Book) {
+        inBookshelf = true
+        LocalBook.mergeBook(localBook, bookData.value).let {
+            bookData.postValue(it)
+            loadChapter(it)
         }
     }