Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-17 18:59:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix logic for searchWithGenre (#7559)

Browse Source 
(cherry picked from commit b563e85c3b)
This commit is contained in:
MatchaSoba 2022-07-30 23:53:25 +08:00 committed by arkon
parent d4adb664cc
commit 650c2dc6e7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceController.kt
View File

@ -343,11 +343,11 @@ open class BrowseSourceController(bundle: Bundle) :
* @param genreName the name of the genre * @param genreName the name of the genre
*/ */
fun searchWithGenre(genreName: String) { fun searchWithGenre(genreName: String) {
presenter.sourceFilters = presenter.source.getFilterList() val defaultFilters = presenter.source.getFilterList()
var filterList: FilterList? = null var genreExists = false
filter@ for (sourceFilter in presenter.sourceFilters) { filter@ for (sourceFilter in defaultFilters) {
if (sourceFilter is Filter.Group<*>) { if (sourceFilter is Filter.Group<*>) {
for (filter in sourceFilter.state) { for (filter in sourceFilter.state) {
if (filter is Filter<*> && filter.name.equals(genreName, true)) { if (filter is Filter<*> && filter.name.equals(genreName, true)) {
@ -356,7 +356,7 @@ open class BrowseSourceController(bundle: Bundle) :
is Filter.CheckBox -> filter.state = true is Filter.CheckBox -> filter.state = true
else -> {} else -> {}
} }
filterList = presenter.sourceFilters genreExists = true
break@filter break@filter
} }
} }
@ -366,19 +366,20 @@ open class BrowseSourceController(bundle: Bundle) :
if (index != -1) { if (index != -1) {
sourceFilter.state = index sourceFilter.state = index
filterList = presenter.sourceFilters genreExists = true
break break
} }
} }
} }
if (filterList != null) { if (genreExists) {
presenter.sourceFilters = defaultFilters
filterSheet?.setFilters(presenter.filterItems) filterSheet?.setFilters(presenter.filterItems)
showProgressBar() showProgressBar()
adapter?.clear() adapter?.clear()
presenter.restartPager("", filterList) presenter.restartPager("", defaultFilters)
} else { } else {
searchWithQuery(genreName) searchWithQuery(genreName)
} }