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 6cfdc25fe..2ff58fbda 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 @@ -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(it) { _, webFile, _ -> 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 509c4b509..f21389256 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 @@ -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 } }