Fix Crash while trying to search in Settings (#6397)
* Fix Crash while trying to search in Settings * Use already provided categories (cherry picked from commit fc3a200a63420477e0516ff2c2316b8619dbd8d7)
This commit is contained in:
parent
4f861f698c
commit
756ddebda9
@ -256,9 +256,6 @@ class SettingsLibraryController : SettingsController() {
|
||||
}
|
||||
|
||||
fun updateSummary() {
|
||||
val dbCategories = db.getCategories().executeAsBlocking()
|
||||
val allCategories = listOf(Category.createDefault(activity!!)) + dbCategories
|
||||
|
||||
val includedCategories = preferences.libraryUpdateCategories().get()
|
||||
.mapNotNull { id -> categories.find { it.id == id.toInt() } }
|
||||
.sortedBy { it.order }
|
||||
@ -270,14 +267,14 @@ class SettingsLibraryController : SettingsController() {
|
||||
val includedItemsText = if (includedCategories.isEmpty()) {
|
||||
context.getString(R.string.none)
|
||||
} else {
|
||||
if (includedCategories.size == allCategories.size) context.getString(R.string.all)
|
||||
if (includedCategories.size == categories.size) context.getString(R.string.all)
|
||||
else includedCategories.joinToString { it.name }
|
||||
}
|
||||
|
||||
val excludedItemsText = if (excludedCategories.isEmpty()) {
|
||||
context.getString(R.string.none)
|
||||
} else {
|
||||
if (excludedCategories.size == allCategories.size) context.getString(R.string.all)
|
||||
if (excludedCategories.size == categories.size) context.getString(R.string.all)
|
||||
else excludedCategories.joinToString { it.name }
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user