From d04161cc9ee2c531ef4a2da69ffeb61b2792c7de Mon Sep 17 00:00:00 2001 From: arkon Date: Sat, 12 Jun 2021 10:49:30 -0400 Subject: [PATCH] Surface exceptions when fetching pages properly (fixes #5377) (cherry picked from commit 8d25ce732307f2aee41f40a5a3c656458863f0da) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt --- .../java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt | 2 +- .../java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt index c8c89d791..51fd4f297 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/ChapterLoader.kt @@ -55,6 +55,7 @@ class ChapterLoader( }.map { pages -> loader to pages } } .observeOn(AndroidSchedulers.mainThread()) + .doOnError { chapter.state = ReaderChapter.State.Error(it) } .doOnNext { (loader, pages) -> if (pages.isEmpty()) { throw Exception(context.getString(R.string.page_list_empty_error)) @@ -73,7 +74,6 @@ class ChapterLoader( } } .toCompletable() - .doOnError { chapter.state = ReaderChapter.State.Error(it) } } /** diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt index 79ffae760..4c941bbf6 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/HttpPageLoader.kt @@ -98,7 +98,6 @@ class HttpPageLoader( override fun getPages(): Observable> { return Observable.fromCallable { chapterCache.getPageListFromCache(chapter.chapter) } .onErrorResumeNext { source.fetchPageList(chapter.chapter) } - .onErrorReturn { emptyList() } .map { pages -> // SY --> val rp = pages.mapIndexed { index, page ->