diff --git a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt index d64855f508..781f918ec9 100644 --- a/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt +++ b/app/src/main/java/com/droiddeck/launcher/stores/itch/ItchBrowse.kt @@ -151,8 +151,9 @@ internal object ItchBrowseState { if (active) more(context) } - fun more(context: Context) { - if (loading || ended || !active) return + /** Asks for the next page. A page that failed is only asked for again when [retry] is set, so scrolling can't loop on it. */ + fun more(context: Context, retry: Boolean = false) { + if (loading || ended || !active || (failed && !retry)) return loading = true failed = false val app = context.applicationContext @@ -164,13 +165,12 @@ internal object ItchBrowseState { StoresState.post { if (mine != generation) return@post loading = false - if (answer == null) { - failed = items.isEmpty() - ended = items.isNotEmpty() + // A thrown or non-2xx fetch leaves the list open so the same page can be asked for again. + if (answer == null || answer.code !in 200..299) { + failed = true return@post } if (answer.items.isEmpty()) { - failed = items.isEmpty() && answer.code !in 200..299 ended = true return@post } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt index 896d1b37f8..da53f7ebf8 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/ItchBrowseBar.kt @@ -56,6 +56,9 @@ internal fun ItchLoadMore() { val count = ItchBrowseState.items.size LaunchedEffect(count) { ItchBrowseState.more(ctx) } if (ItchBrowseState.loading) LinearProgressIndicator(Modifier.fillMaxWidth().padding(vertical = 12.dp)) + else if (ItchBrowseState.failed) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { + BrowseChip(stringResource(R.string.stores_dl_retry), false) { ItchBrowseState.more(ctx, retry = true) } + } else if (!ItchBrowseState.ended && count > 0) Box(Modifier.fillMaxWidth().padding(vertical = 8.dp), contentAlignment = Alignment.Center) { BrowseChip(stringResource(R.string.stores_itch_load_more), false) { ItchBrowseState.more(ctx) } } diff --git a/docs/development/itch-browse.md b/docs/development/itch-browse.md index 78c056300b..241b508537 100644 --- a/docs/development/itch-browse.md +++ b/docs/development/itch-browse.md @@ -30,3 +30,7 @@ use, so a game looks the same wherever it appears. query bumps a generation counter, so a slow answer for an older one is dropped. A game already in the library replaces its browse copy on the grid, so Install and the owned markers are right; the detail page looks browse results up through `StoresState.detailItem`. + +## When a page fails + +A fetch that throws or answers with a non-2xx status marks the list as failed but leaves it open. The end of the list then shows a Retry button that asks for the same page again. Scrolling does not retry on its own, so a failing page cannot loop. Only a successful page with no new games ends the list.