From a19d59cdf060edc59663fc710b287367b9778ea6 Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 29 Nov 2020 15:01:13 -0500 Subject: [PATCH] Fix crash when a preference doesn't have a title (e.g. info preference) (cherry picked from commit 3133a63cf82ac58f8731e8ff10865a516082aef0) --- .../tachiyomi/ui/setting/search/SettingsSearchHelper.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt index c98e2613c..de918f163 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt @@ -99,8 +99,8 @@ object SettingsSearchHelper { pref: Preference, breadcrumbs: String = "" ) { - when (pref) { - is PreferenceGroup -> { + when { + pref is PreferenceGroup -> { val breadcrumbsStr = addLocalizedBreadcrumb(breadcrumbs, "${pref.title}") for (x in 0 until pref.preferenceCount) { @@ -108,7 +108,7 @@ object SettingsSearchHelper { getSettingSearchResult(ctrl, subPref, breadcrumbsStr) // recursion } } - is PreferenceCategory -> { + pref is PreferenceCategory -> { val breadcrumbsStr = addLocalizedBreadcrumb(breadcrumbs, "${pref.title}") for (x in 0 until pref.preferenceCount) { @@ -116,7 +116,7 @@ object SettingsSearchHelper { getSettingSearchResult(ctrl, subPref, breadcrumbsStr) // recursion } } - else -> { + (pref.title != null) -> { // Is an actual preference val title = pref.title.toString() val summary = if (pref.summary != null) pref.summary.toString() else ""