mirror of
https://github.com/tachiyomiorg/tachiyomi.git
synced 2024-11-19 01:59:19 +01:00
Fix Crash while trying to search in Settings (#6397)
* Fix Crash while trying to search in Settings * Use already provided categories
This commit is contained in:
parent
6a00658119
commit
fc3a200a63
@ -230,9 +230,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 }
|
||||
@ -244,14 +241,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…
Reference in New Issue
Block a user