From 4e28806c2b6979fd7850fc53f158d25f62ac5f6a Mon Sep 17 00:00:00 2001 From: gedoor Date: Mon, 29 Mar 2021 23:08:21 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=83=E7=94=A8=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/ui/book/read/ReadBookActivity.kt | 8 ++++++-- .../java/io/legado/app/ui/config/OtherConfigFragment.kt | 1 + .../java/io/legado/app/ui/config/ThemeConfigFragment.kt | 2 ++ .../java/io/legado/app/ui/replace/ReplaceRuleActivity.kt | 4 +++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt index cdd58cb13..5fbd4d55f 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt @@ -83,11 +83,15 @@ class ReadBookActivity : ReadBookBaseActivity(), } private val sourceEditActivity = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { - upView() + if (it.resultCode == RESULT_OK) { + upView() + } } private val replaceActivity = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { - viewModel.replaceRuleChanged() + if (it.resultCode == RESULT_OK) { + viewModel.replaceRuleChanged() + } } private val searchContentActivity = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { diff --git a/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt index a9cc4dcd8..9c09e7620 100644 --- a/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/OtherConfigFragment.kt @@ -45,6 +45,7 @@ class OtherConfigFragment : BasePreferenceFragment(), ) private val webPort get() = getPrefInt(PreferKey.webPort, 1122) private val selectCoverImage = registerForActivityResult(ActivityResultContracts.GetContent()) { + it ?: return@registerForActivityResult setCoverFromUri(it) } diff --git a/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt index 5cb141213..4bcb6faf8 100644 --- a/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt +++ b/app/src/main/java/io/legado/app/ui/config/ThemeConfigFragment.kt @@ -38,11 +38,13 @@ class ThemeConfigFragment : BasePreferenceFragment(), SharedPreferences.OnSharedPreferenceChangeListener { private val selectLightBg = registerForActivityResult(ActivityResultContracts.GetContent()) { + it ?: return@registerForActivityResult setBgFromUri(it, PreferKey.bgImage) { upTheme(false) } } private val selectDarkBg = registerForActivityResult(ActivityResultContracts.GetContent()) { + it ?: return@registerForActivityResult setBgFromUri(it, PreferKey.bgImageN) { upTheme(true) } diff --git a/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt index 263e4896a..382638fb8 100644 --- a/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt +++ b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt @@ -64,7 +64,9 @@ class ReplaceRuleActivity : VMBaseActivity kotlin.runCatching {