From 2723aeeb5c47585bc9ac1ca762c6f7d7dbcaf495 Mon Sep 17 00:00:00 2001
From: len <len@kanade.eu>
Date: Fri, 3 Jun 2016 12:37:07 +0200
Subject: [PATCH] Better error feedback. Closes #325
---
.../eu/kanade/tachiyomi/data/source/online/OnlineSource.kt | 3 +++
.../main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt | 2 +-
app/src/main/res/values/strings.xml | 1 -
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/data/source/online/OnlineSource.kt b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/OnlineSource.kt
index 0c87800983..fb1325a2cf 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/data/source/online/OnlineSource.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/data/source/online/OnlineSource.kt
@@ -261,6 +261,9 @@ abstract class OnlineSource(context: Context) : Source {
.newCall(pageListRequest(chapter))
.asObservable()
.map { response ->
+ if (!response.isSuccessful) {
+ throw Exception("Webpage sent ${response.code()} code")
+ }
mutableListOf<Page>().apply {
pageListParse(response, this)
if (isEmpty()) {
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
index 853ec7141a..15f6e72050 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/ReaderActivity.kt
@@ -222,7 +222,7 @@ class ReaderActivity : BaseRxActivity<ReaderPresenter>() {
fun onChapterError(error: Throwable) {
Timber.e(error, error.message)
finish()
- toast(R.string.page_list_error)
+ toast(error.message)
}
fun onChapterAppendError() {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 55d4e71f57..1d8f621e04 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -252,7 +252,6 @@
<string name="downloading">Downloading…</string>
<string name="download_progress">Downloaded %1$d%%</string>
<string name="chapter_progress">Page: %1$d</string>
- <string name="page_list_error">Error fetching page list. Check your internet connection.</string>
<string name="chapter_subtitle">Chapter %1$s</string>
<string name="no_next_chapter">Next chapter not found</string>
<string name="no_previous_chapter">Previous chapter not found</string>