From fc3a200a63420477e0516ff2c2316b8619dbd8d7 Mon Sep 17 00:00:00 2001 From: FourTOne5 <59261191+FourTOne5@users.noreply.github.com> Date: Sat, 1 Jan 2022 00:21:05 +0600 Subject: [PATCH] Fix Crash while trying to search in Settings (#6397) * Fix Crash while trying to search in Settings * Use already provided categories --- .../tachiyomi/ui/setting/SettingsLibraryController.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt index 74366f2a2..b132f5ba8 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/setting/SettingsLibraryController.kt @@ -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 } }