From 2b444c262d222075893f2074e5a381dba41e0cb4 Mon Sep 17 00:00:00 2001 From: Dude so hot Date: Fri, 7 Jun 2024 16:43:46 +0800 Subject: [PATCH] Move archive dialog invalidator to use `ensure` --- .../eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt index 91a7269b5..2f853980a 100644 --- a/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt +++ b/app/src/main/kotlin/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt @@ -65,6 +65,7 @@ import androidx.core.view.WindowInsetsControllerCompat import androidx.core.view.isVisible import androidx.lifecycle.ViewModel import androidx.lifecycle.lifecycleScope +import arrow.core.raise.ensure import com.hippo.ehviewer.BuildConfig import com.hippo.ehviewer.R import com.hippo.ehviewer.Settings @@ -173,12 +174,8 @@ class ReaderActivity : EhActivity() { title = getString(R.string.archive_need_passwd), hint = getString(R.string.archive_passwd), ) { text -> - if (text.isBlank()) { - raise(getString(R.string.passwd_cannot_be_empty)) - } - if (!invalidator(text)) { - raise(getString(R.string.passwd_wrong)) - } + ensure(text.isNotBlank()) { getString(R.string.passwd_cannot_be_empty) } + ensure(invalidator(text)) { getString(R.string.passwd_wrong) } } }.onFailure { finish()