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

Properly check if the source supports latest

Browse Source
This commit is contained in:
Jobobby04 2022-03-27 20:35:56 -04:00
parent ceca8207ad
commit 2207d9ffa4
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/SourceController.kt
View File

@ -144,7 +144,7 @@ class SourceController(bundle: Bundle? = null) :
Mode.CATALOGUE -> { Mode.CATALOGUE -> {
// Open the catalogue view. // Open the catalogue view.
// SY --> // SY -->
if (source.supportsLatest && preferences.useNewSourceNavigation().get()) { if (preferences.useNewSourceNavigation().get()) {
openSourceFeed(source) openSourceFeed(source)
} else openSource(source, BrowseSourceController(source)) } else openSource(source, BrowseSourceController(source))
// SY <-- // SY <--

7
app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/feed/SourceFeedPresenter.kt
View File

@ -137,7 +137,12 @@ open class SourceFeedPresenter(
val savedSearches = db.getSourceSavedSearchesFeed(source.id).executeAsBlocking() val savedSearches = db.getSourceSavedSearchesFeed(source.id).executeAsBlocking()
.associateBy { it.id!! } .associateBy { it.id!! }
return listOf(SourceFeed.Latest, SourceFeed.Browse) + db.getSourceFeedSavedSearches(source.id).executeAsBlocking() return listOfNotNull(
if (source.supportsLatest) {
SourceFeed.Latest
} else null,
SourceFeed.Browse
) + db.getSourceFeedSavedSearches(source.id).executeAsBlocking()
.map { SourceFeed.SourceSavedSearch(it, savedSearches[it.savedSearch]!!) } .map { SourceFeed.SourceSavedSearch(it, savedSearches[it.savedSearch]!!) }
} }