优化

2 years ago · e947ccab31
parent ccbf610509
commit e947ccab31
2 changed files with 5 additions and 4 deletions
--- 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
--- 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)