yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases 2 Wiki Activity

fix

Browse Source
This commit is contained in:
Xwite
2023-03-07 18:00:33 +08:00
parent 880df24523
commit 0949b776cc
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
+3 -1
View File
@@ -494,7 +494,9 @@ class BookInfoActivity :
} }
} }
private fun showWebFileDownloadAlert(onClick: ((Book) -> Unit)?) { private fun showWebFileDownloadAlert(
onClick: ((Book) -> Unit)? = null
) {
viewModel.webFileData.value?.let { viewModel.webFileData.value?.let {
alert(titleResource = R.string.download_and_import_file) { alert(titleResource = R.string.download_and_import_file) {
items<BookInfoViewModel.WebFile>(it) { _, webFile, _ -> items<BookInfoViewModel.WebFile>(it) { _, webFile, _ ->
app/src/main/java/io/legado/app/ui/book/info/BookInfoViewModel.kt
+3 -3
View File
@@ -276,7 +276,6 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
if (webFile.isSupported) { if (webFile.isSupported) {
val book = LocalBook.importFileOnLine(webFile.url, webFile.name, bookSource) val book = LocalBook.importFileOnLine(webFile.url, webFile.name, bookSource)
changeToLocalBook(book) changeToLocalBook(book)
book
} else { } else {
LocalBook.saveBookFile(webFile.url, webFile.name, bookSource) 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 inBookshelf = true
LocalBook.mergeBook(localBook, bookData.value).let { return LocalBook.mergeBook(localBook, bookData.value).let {
bookData.postValue(it) bookData.postValue(it)
loadChapter(it) loadChapter(it)
it
} }
} }