From 46bc9b08c329a4e791e0416ea1707d03c48deb29 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 3 Nov 2023 18:17:42 +0100
Subject: [PATCH] Log WebView errors

---
 app/src/main/java/eu/faircode/email/ActivityAMP.java        | 6 ++++++
 app/src/main/java/eu/faircode/email/ActivityCode.java       | 6 ++++++
 .../main/java/eu/faircode/email/FragmentDialogPrint.java    | 6 ++++++
 app/src/main/java/eu/faircode/email/WebViewEx.java          | 6 ++++++
 4 files changed, 24 insertions(+)

diff --git a/app/src/main/java/eu/faircode/email/ActivityAMP.java b/app/src/main/java/eu/faircode/email/ActivityAMP.java
index d43d87b452..629db23c3e 100644
--- a/app/src/main/java/eu/faircode/email/ActivityAMP.java
+++ b/app/src/main/java/eu/faircode/email/ActivityAMP.java
@@ -30,6 +30,8 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.webkit.WebResourceError;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -125,6 +127,10 @@ public class ActivityAMP extends ActivityBase {
 
                 return false;
             }
+
+            public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
+                Log.w("AMP error " + error.getErrorCode() + ":" + error.getDescription());
+            }
         });
 
         // Initialize
diff --git a/app/src/main/java/eu/faircode/email/ActivityCode.java b/app/src/main/java/eu/faircode/email/ActivityCode.java
index 49a1d7a965..d85a41fcd2 100644
--- a/app/src/main/java/eu/faircode/email/ActivityCode.java
+++ b/app/src/main/java/eu/faircode/email/ActivityCode.java
@@ -31,6 +31,8 @@ import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.webkit.WebResourceError;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -111,6 +113,10 @@ public class ActivityCode extends ActivityBase {
 
                 return true;
             }
+
+            public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
+                Log.w("View code error " + error.getErrorCode() + ":" + error.getDescription());
+            }
         });
 
         // Initialize
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogPrint.java b/app/src/main/java/eu/faircode/email/FragmentDialogPrint.java
index 2c1f8e7f5e..99a4db61f2 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogPrint.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogPrint.java
@@ -34,6 +34,8 @@ import android.text.Spanned;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.webkit.WebResourceError;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -407,6 +409,10 @@ public class FragmentDialogPrint extends FragmentDialogBase {
                             printWebView = null;
                         }
                     }
+
+                    public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
+                        Log.w("Print error " + error.getErrorCode() + ":" + error.getDescription());
+                    }
                 });
 
                 Log.i("Print load data");
diff --git a/app/src/main/java/eu/faircode/email/WebViewEx.java b/app/src/main/java/eu/faircode/email/WebViewEx.java
index 226804dde5..524445b37d 100644
--- a/app/src/main/java/eu/faircode/email/WebViewEx.java
+++ b/app/src/main/java/eu/faircode/email/WebViewEx.java
@@ -34,6 +34,8 @@ import android.view.MotionEvent;
 import android.view.View;
 import android.webkit.DownloadListener;
 import android.webkit.RenderProcessGoneDetail;
+import android.webkit.WebResourceError;
+import android.webkit.WebResourceRequest;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -188,6 +190,10 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
                 Log.i("Changed scale=" + newScale);
                 intf.onScaleChanged(newScale);
             }
+
+            public void onReceivedError(WebView view, WebResourceRequest request, WebResourceError error) {
+                Log.w("WebViewEx error " + error.getErrorCode() + ":" + error.getDescription());
+            }
         });
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)