Merge pull request #1880 from Xwite/master

导入在线文件bug

app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt

@@ -230,7 +230,7 @@ class BookInfoActivity :
                 binding.tvToc.text = getString(R.string.toc_s, getString(R.string.loading))
             }
             chapterList.isNullOrEmpty() -> {
-                binding.tvToc.text = getString(R.string.toc_s, getString(R.string.error_load_toc))
+                binding.tvToc.text = if (viewModel.isImportBookOnLine) getString(R.string.click_read_button_load) else getString(R.string.toc_s, getString(R.string.error_load_toc))
             }
             else -> {
                 viewModel.bookData.value?.let {

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

@@ -78,7 +78,9 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
             isImportBookOnLine = (bookSource?.bookSourceType ?: BookType.local) == BookType.file
             if (book.tocUrl.isEmpty()) {
                 loadBookInfo(book)
-            } else if (!isImportBookOnLine) {
+            } else if (isImportBookOnLine) {
+                chapterListData.postValue(emptyList())
+            } else {
                 val chapterList = appDb.bookChapterDao.getChapterList(book.bookUrl)
                 if (chapterList.isNotEmpty()) {
                     chapterListData.postValue(chapterList)
@@ -111,7 +113,7 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
         execute(scope) {
             if (book.isLocalBook()) {
                 loadChapter(book, scope)
-            } else if (!isImportBookOnLine) {
+            } else {
                 bookSource?.let { bookSource ->
                     WebBook.getBookInfo(this, bookSource, book, canReName = canReName)
                         .onSuccess(IO) {
@@ -144,6 +146,8 @@ class BookInfoViewModel(application: Application) : BaseViewModel(application) {
                     appDb.bookChapterDao.insert(*it.toTypedArray())
                     chapterListData.postValue(it)
                 }
+            } else if (isImportBookOnLine) {
+                chapterListData.postValue(emptyList())
             } else {
                 bookSource?.let { bookSource ->
                     WebBook.getChapterList(this, bookSource, book)

app/src/main/res/values-es-rES/strings.xml

@@ -979,5 +979,6 @@
     <string name="import_theme">导入主题</string>
     <string name="import_txt_toc_rule">导入txt目录规则</string>
     <string name="auto_save_cookie">CookieJar</string>
+    <string name="click_read_button_load">点击阅读加载目录</string>
     <!-- string end -->
 </resources>

app/src/main/res/values-ja-rJP/strings.xml

@@ -982,5 +982,6 @@
     <string name="import_theme">导入主题</string>
     <string name="import_txt_toc_rule">导入txt目录规则</string>
     <string name="auto_save_cookie">CookieJar</string>
+    <string name="click_read_button_load">点击阅读加载目录</string>
     <!-- string end -->
 </resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -982,5 +982,6 @@
     <string name="import_theme">导入主题</string>
     <string name="import_txt_toc_rule">导入txt目录规则</string>
     <string name="auto_save_cookie">CookieJar</string>
+    <string name="click_read_button_load">点击阅读加载目录</string>
     <!-- string end -->
 </resources>

app/src/main/res/values-zh-rHK/strings.xml

@@ -979,5 +979,6 @@
     <string name="import_theme">导入主题</string>
     <string name="import_txt_toc_rule">导入txt目录规则</string>
     <string name="auto_save_cookie">CookieJar</string>
+    <string name="click_read_button_load">点击阅读加载目录</string>
     <!-- string end -->
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -981,5 +981,6 @@
     <string name="import_theme">导入主题</string>
     <string name="import_txt_toc_rule">导入txt目录规则</string>
     <string name="auto_save_cookie">CookieJar</string>
+    <string name="click_read_button_load">点击阅读加载目录</string>
     <!-- string end -->
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -981,5 +981,6 @@
     <string name="import_theme">导入主题</string>
     <string name="import_txt_toc_rule">导入txt目录规则</string>
     <string name="auto_save_cookie">CookieJar</string>
+    <string name="click_read_button_load">点击阅读加载目录</string>
     <!-- string end -->
 </resources>

app/src/main/res/values/strings.xml

@@ -982,5 +982,6 @@
     <string name="import_theme">导入主题</string>
     <string name="import_txt_toc_rule">导入txt目录规则</string>
     <string name="auto_save_cookie">CookieJar</string>
+    <string name="click_read_button_load">点击阅读加载目录</string>
     <!-- string end -->
 </resources>