Surface exceptions when fetching pages properly (fixes #5377)

aniyomiorg · Jun 12, 2021 · 8d25ce7 · 8d25ce7
1 parent 8deca3b
commit 8d25ce7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 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
@@ -47,6 +47,7 @@ class ChapterLoader(
                 }
             }
             .observeOn(AndroidSchedulers.mainThread())
+            .doOnError { chapter.state = ReaderChapter.State.Error(it) }
             .doOnNext { pages ->
                 if (pages.isEmpty()) {
                     throw Exception(context.getString(R.string.page_list_empty_error))
@@ -61,7 +62,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
@@ -87,7 +87,6 @@ class HttpPageLoader(
     override fun getPages(): Observable<List<ReaderPage>> {
         return Observable.fromCallable { chapterCache.getPageListFromCache(chapter.chapter) }
             .onErrorResumeNext { source.fetchPageList(chapter.chapter) }
-            .onErrorReturn { emptyList() }
             .map { pages ->
                 pages.mapIndexed { index, page ->
                     // Don't trust sources and use our own indexing