From e947ccab31b4fded317dd0d3520b657126e041eb Mon Sep 17 00:00:00 2001 From: kunfei Date: Sat, 15 Oct 2022 22:54:40 +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 --- .../java/io/legado/app/help/source/BookSourceExtensions.kt | 5 ++++- .../java/io/legado/app/ui/book/search/SearchScopeDialog.kt | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/legado/app/help/source/BookSourceExtensions.kt b/app/src/main/java/io/legado/app/help/source/BookSourceExtensions.kt index bbe913021..946d6d42a 100644 --- a/app/src/main/java/io/legado/app/help/source/BookSourceExtensions.kt +++ b/app/src/main/java/io/legado/app/help/source/BookSourceExtensions.kt @@ -77,7 +77,10 @@ suspend fun BookSource.clearExploreKindsCache() { } } -fun BookSource.contains(word: String): Boolean { +fun BookSource.contains(word: String?): Boolean { + if (word.isNullOrEmpty()) { + return true + } return bookSourceName.contains(word) || bookSourceUrl.contains(word) || bookSourceGroup?.contains(word) == true diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchScopeDialog.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchScopeDialog.kt index 78fe0ca74..8d7ff9fab 100644 --- a/app/src/main/java/io/legado/app/ui/book/search/SearchScopeDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/SearchScopeDialog.kt @@ -117,9 +117,7 @@ class SearchScopeDialog : BaseDialogFragment(R.layout.dialog_search_scope) { withContext(IO) { if (binding.rbSource.isChecked) { sources.filter { source -> - screenText?.let { screenText -> - source.contains(screenText) - } ?: true + source.contains(screenText) }.let { screenSources.clear() screenSources.addAll(it)