Fix crash when a preference doesn't have a title (e.g. info preference)

(cherry picked from commit 3133a63cf82ac58f8731e8ff10865a516082aef0)
This commit is contained in:
arkon 2020-11-29 15:01:13 -05:00 committed by Jobobby04
parent 6a1a7275c8
commit a19d59cdf0

View File

@ -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 ""