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

Fix a few more endless loading issues

Browse Source
This commit is contained in:
Jays2Kings 2021-04-07 04:01:12 -04:00
parent 40a9b2c421
commit 212386f3cc
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/kanade/tachiyomi/ui/recents/RecentsController.kt
View File

@ -312,7 +312,7 @@ class RecentsController(bundle: Bundle? = null) :
if (!hasNewItems || presenter.viewType == RecentsPresenter.VIEW_TYPE_GROUP_ALL || presenter.query.isNotEmpty() ||
recents.isEmpty()
) {
onAddPageError()
loadNoMore()
} else if (hasNewItems && presenter.viewType != RecentsPresenter.VIEW_TYPE_GROUP_ALL && presenter.query.isEmpty()) {
resetProgressItem()
}
@ -477,7 +477,7 @@ class RecentsController(bundle: Bundle? = null) :
setOnQueryTextChangeListener(searchView) {
if (presenter.query != it) {
presenter.query = it ?: return@setOnQueryTextChangeListener false
onAddPageError()
loadNoMore()
refresh()
}
true
@ -544,14 +544,18 @@ class RecentsController(bundle: Bundle? = null) :
override fun onLoadMore(lastPosition: Int, currentPage: Int) {
val view = view ?: return
if (presenter.finished || BackupRestoreService.isRunning(view.context.applicationContext)) {
onAddPageError()
if (presenter.finished ||
BackupRestoreService.isRunning(view.context.applicationContext) ||
presenter.viewType == RecentsPresenter.VIEW_TYPE_GROUP_ALL ||
presenter.query.isNotEmpty()
) {
loadNoMore()
return
}
presenter.requestNext()
}
private fun onAddPageError() {
private fun loadNoMore() {
adapter.onLoadMoreComplete(null)
}