Xwite 3 лет назад
Родитель
Сommit
0949b776cc

+ 3 - 1
app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt

@@ -494,7 +494,9 @@ class BookInfoActivity :
         }
     }
 
-    private fun showWebFileDownloadAlert(onClick: ((Book) -> Unit)?) {
+    private fun showWebFileDownloadAlert(
+        onClick: ((Book) -> Unit)? = null
+    ) {
         viewModel.webFileData.value?.let {
             alert(titleResource = R.string.download_and_import_file) {
                 items<BookInfoViewModel.WebFile>(it) { _, webFile, _ ->

+ 3 - 3
app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt

@@ -276,7 +276,6 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
            if (webFile.isSupported) {
                val book = LocalBook.importFileOnLine(webFile.url, webFile.name, bookSource)
                changeToLocalBook(book)
-               book
            } else {
                LocalBook.saveBookFile(webFile.url, webFile.name, bookSource)
            }
@@ -401,11 +400,12 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
         }
     }
 
-    private fun changeToLocalBook(localBook: Book) {
+    private fun changeToLocalBook(localBook: Book): Book {
         inBookshelf = true
-        LocalBook.mergeBook(localBook, bookData.value).let {
+        return LocalBook.mergeBook(localBook, bookData.value).let {
             bookData.postValue(it)
             loadChapter(it)
+            it
         }
     }