diff --git a/app/src/main/java/io/legado/app/model/webBook/BookList.kt b/app/src/main/java/io/legado/app/model/webBook/BookList.kt index 157ddcff0..656351c5b 100644 --- a/app/src/main/java/io/legado/app/model/webBook/BookList.kt +++ b/app/src/main/java/io/legado/app/model/webBook/BookList.kt @@ -196,7 +196,7 @@ object BookList { Debug.log(bookSource.bookSourceUrl, "┌获取分类", log) try { searchBook.kind = analyzeRule.getStringList(ruleKind)?.joinToString(",") - Debug.log(bookSource.bookSourceUrl, "└${searchBook.kind}", log) + Debug.log(bookSource.bookSourceUrl, "└${searchBook.kind ?: ""}", log) } catch (e: Exception) { Debug.log(bookSource.bookSourceUrl, "└${e.localizedMessage}", log) } @@ -232,7 +232,7 @@ object BookList { searchBook.coverUrl = NetworkUtils.getAbsoluteURL(baseUrl, it) } } - Debug.log(bookSource.bookSourceUrl, "└${searchBook.coverUrl}", log) + Debug.log(bookSource.bookSourceUrl, "└${searchBook.coverUrl ?: ""}", log) } catch (e: java.lang.Exception) { Debug.log(bookSource.bookSourceUrl, "└${e.localizedMessage}", log) } 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 ae46540c7..abf855a35 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 @@ -402,6 +402,10 @@ class BookInfoActivity : } } tvTocView.setOnClickListener { + if (viewModel.chapterListData.value.isNullOrEmpty()) { + toastOnUi(R.string.chapter_list_empty) + return@setOnClickListener + } viewModel.getBook()?.let { book -> if (!viewModel.inBookshelf) { viewModel.saveBook(book) { @@ -533,10 +537,6 @@ class BookInfoActivity : } private fun openChapterList() { - if (viewModel.chapterListData.value.isNullOrEmpty()) { - toastOnUi(R.string.chapter_list_empty) - return - } viewModel.getBook()?.let { tocActivityResult.launch(it.bookUrl) }