mirror of
https://github.com/gedoor/legado.git
synced 2025-08-10 00:52:30 +00:00
fix: 导入在线文件bug
This commit is contained in:
@@ -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 {
|
||||
|
||||
@@ -111,7 +111,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 +144,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)
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user