Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
(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
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/kanade/tachiyomi/ui/setting/search/SettingsSearchHelper.kt
View File

@ -99,8 +99,8 @@ object SettingsSearchHelper {
pref: Preference, pref: Preference,
breadcrumbs: String = "" breadcrumbs: String = ""
) { ) {
when (pref) { when {
is PreferenceGroup -> { pref is PreferenceGroup -> {
val breadcrumbsStr = addLocalizedBreadcrumb(breadcrumbs, "${pref.title}") val breadcrumbsStr = addLocalizedBreadcrumb(breadcrumbs, "${pref.title}")
for (x in 0 until pref.preferenceCount) { for (x in 0 until pref.preferenceCount) {
@ -108,7 +108,7 @@ object SettingsSearchHelper {
getSettingSearchResult(ctrl, subPref, breadcrumbsStr) // recursion getSettingSearchResult(ctrl, subPref, breadcrumbsStr) // recursion
} }
} }
is PreferenceCategory -> { pref is PreferenceCategory -> {
val breadcrumbsStr = addLocalizedBreadcrumb(breadcrumbs, "${pref.title}") val breadcrumbsStr = addLocalizedBreadcrumb(breadcrumbs, "${pref.title}")
for (x in 0 until pref.preferenceCount) { for (x in 0 until pref.preferenceCount) {
@ -116,7 +116,7 @@ object SettingsSearchHelper {
getSettingSearchResult(ctrl, subPref, breadcrumbsStr) // recursion getSettingSearchResult(ctrl, subPref, breadcrumbsStr) // recursion
} }
} }
else -> { (pref.title != null) -> {
// Is an actual preference // Is an actual preference
val title = pref.title.toString() val title = pref.title.toString()
val summary = if (pref.summary != null) pref.summary.toString() else "" val summary = if (pref.summary != null) pref.summary.toString() else ""