From e85c830d2f2ea5891672c52d65d38047e021089c Mon Sep 17 00:00:00 2001 From: Horis <821938089@qq.com> Date: Tue, 5 Sep 2023 22:03:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/model/rss/RssParserByRule.kt | 2 +- .../java/io/legado/app/ui/config/BackupConfigFragment.kt | 9 ++++++++- app/src/main/res/layout/view_toast.xml | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/rss/RssParserByRule.kt b/app/src/main/java/io/legado/app/model/rss/RssParserByRule.kt index 9d52f7a42..8f3621be6 100644 --- a/app/src/main/java/io/legado/app/model/rss/RssParserByRule.kt +++ b/app/src/main/java/io/legado/app/model/rss/RssParserByRule.kt @@ -106,7 +106,7 @@ object RssParserByRule { rssArticle.pubDate = analyzeRule.getString(rulePubDate) Debug.log(sourceUrl, "└${rssArticle.pubDate}", log) Debug.log(sourceUrl, "┌获取描述", log) - if (ruleDescription.isNullOrEmpty()) { + if (ruleDescription.isEmpty()) { rssArticle.description = null Debug.log(sourceUrl, "└描述规则为空，将会解析内容页", log) } else { diff --git a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt index 5ffbb63a6..5ef65682e 100644 --- a/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/BackupConfigFragment.kt @@ -94,8 +94,15 @@ class BackupConfigFragment : PreferenceFragment(), } private val restoreDoc = registerForActivityResult(HandleFileContract()) { it.uri?.let { uri -> - Coroutine.async { + waitDialog.setText("恢复中…") + waitDialog.show() + val task = Coroutine.async { Restore.restore(appCtx, uri) + }.onFinally { + waitDialog.dismiss() + } + waitDialog.setOnCancelListener { + task.cancel() } } } diff --git a/app/src/main/res/layout/view_toast.xml b/app/src/main/res/layout/view_toast.xml index 8ed1aa313..4dc5067ff 100644 --- a/app/src/main/res/layout/view_toast.xml +++ b/app/src/main/res/layout/view_toast.xml @@ -19,7 +19,8 @@ android:layout_height="wrap_content" android:gravity="center_horizontal" android:paddingHorizontal="16dp" - android:paddingVertical="8dp" /> + android:paddingTop="8dp" + android:paddingBottom="10dp"/>