diff --git a/app/src/main/java/io/legado/app/ui/association/AddToBookshelfDialog.kt b/app/src/main/java/io/legado/app/ui/association/AddToBookshelfDialog.kt index 64d379a6c..01b38faa5 100644 --- a/app/src/main/java/io/legado/app/ui/association/AddToBookshelfDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/AddToBookshelfDialog.kt @@ -137,7 +137,7 @@ class AddToBookshelfDialog() : BaseDialogFragment(R.layout.dialog_add_to_bookshe } throw NoStackTraceException("未找到匹配书源") }.onError { - AppLog.put("添加书籍 ${bookUrl} 出错", it) + AppLog.put("添加书籍 $bookUrl 出错", it) loadErrorLiveData.postValue(it.localizedMessage) }.onSuccess { book = it diff --git a/app/src/main/java/io/legado/app/ui/association/OnLineImportActivity.kt b/app/src/main/java/io/legado/app/ui/association/OnLineImportActivity.kt index b3c68ccf8..7d777464f 100644 --- a/app/src/main/java/io/legado/app/ui/association/OnLineImportActivity.kt +++ b/app/src/main/java/io/legado/app/ui/association/OnLineImportActivity.kt @@ -49,8 +49,8 @@ class OnLineImportActivity : finallyDialog(getString(R.string.error), it) } intent.data?.let { - val url = it.toString().substringAfter("src=", "") - if (url.isEmpty()) { + val url = it.getQueryParameter("src") + if (url.isNullOrEmpty()) { finish() return } diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt index 550824143..2c834682a 100644 --- a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt @@ -66,6 +66,7 @@ class RssArticlesViewModel(application: Application) : BaseViewModel(application Rss.getArticles(viewModelScope, sortName, pageUrl, rssSource, page).onSuccess(IO) { nextPageUrl = it.second loadMoreSuccess(it.first) + isLoading = false }.onError { loadFinallyLiveData.postValue(false) AppLog.put("rss获取内容失败", it) @@ -88,7 +89,6 @@ class RssArticlesViewModel(application: Application) : BaseViewModel(application } appDb.rssArticleDao.insert(*articles.toTypedArray()) } - isLoading = false } } \ No newline at end of file