From 896b34d1a27d83223f6f3839f753bf5e4bca7d6a Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Tue, 24 Mar 2020 18:19:15 -0400
Subject: [PATCH] Prompt user to open WebView on HTTP errors

---
 .../browse/BrowseCatalogueController.kt         | 17 +++++++++++++----
 app/src/main/res/values/strings.xml             |  1 +
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt
index 37619f7f27..1249831d9c 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/catalogue/browse/BrowseCatalogueController.kt
@@ -352,10 +352,7 @@ open class BrowseCatalogueController(bundle: Bundle) :
         snack?.dismiss()
 
         if (catalogue_view != null) {
-            val message = if (error is NoResultsException) catalogue_view.context.getString(R.string.no_results_found) else (error.message
-                    ?: "")
-
-            snack = catalogue_view.snack(message, Snackbar.LENGTH_INDEFINITE) {
+            snack = catalogue_view.snack(getErrorMessage(error), Snackbar.LENGTH_INDEFINITE) {
                 setAction(R.string.action_retry) {
                     // If not the first page, show bottom progress bar.
                     if (adapter.mainItemCount > 0) {
@@ -370,6 +367,18 @@ open class BrowseCatalogueController(bundle: Bundle) :
         }
     }
 
+    private fun getErrorMessage(error: Throwable): String {
+        if (error is NoResultsException) {
+            return catalogue_view.context.getString(R.string.no_results_found)
+        }
+
+        return when {
+            error.message == null -> ""
+            error.message!!.startsWith("HTTP error") -> "${error.message}: ${catalogue_view.context.getString(R.string.http_error_hint)}"
+            else -> error.message!!
+        }
+    }
+
     /**
      * Sets a new progress item and reenables the scroll listener.
      */
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 23d824810e..f332274f19 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -378,6 +378,7 @@
     <string name="no_valid_sources">Please enable at least one valid source</string>
     <string name="no_more_results">No more results</string>
     <string name="no_results_found">No results found</string>
+    <string name="http_error_hint">Check website in WebView</string>
     <string name="local_source">Local manga</string>
     <string name="other_source">Other</string>
     <string name="invalid_combination">Default can\'t be selected with other categories</string>