From 58144b7d1dc7ded3edfd6c367fc82f9325f17c92 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 18 Feb 2021 21:39:07 +0100
Subject: [PATCH] Prevent crash

---
 .../eu/faircode/email/AdapterMessage.java     |  2 +-
 .../email/FragmentOptionsPrivacy.java         |  2 +-
 .../java/eu/faircode/email/WebViewEx.java     | 23 +++++++++++++++++--
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index b148b1576e..4020efe06d 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -3742,7 +3742,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 });
 
                 boolean isDark = Helper.isDarkTheme(context);
-                boolean canDark = WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK);
+                boolean canDark = WebViewEx.isFeatureSupported(WebViewFeature.FORCE_DARK);
 
                 tvDark.setVisibility(isDark && !canDark ? View.VISIBLE : View.GONE);
                 cbDark.setVisibility(isDark && canDark ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
index 005f628ed8..45c1bddb5f 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
@@ -268,7 +268,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
             }
         });
 
-        grpSafeBrowsing.setEnabled(WebViewFeature.isFeatureSupported(WebViewFeature.SAFE_BROWSING_ENABLE));
+        grpSafeBrowsing.setEnabled(WebViewEx.isFeatureSupported(WebViewFeature.SAFE_BROWSING_ENABLE));
 
         ibDisconnectBlacklist.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/java/eu/faircode/email/WebViewEx.java b/app/src/main/java/eu/faircode/email/WebViewEx.java
index c674dc905f..025d489646 100644
--- a/app/src/main/java/eu/faircode/email/WebViewEx.java
+++ b/app/src/main/java/eu/faircode/email/WebViewEx.java
@@ -75,11 +75,11 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
         settings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
         settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
 
-        if (WebViewFeature.isFeatureSupported(WebViewFeature.SAFE_BROWSING_ENABLE))
+        if (WebViewEx.isFeatureSupported(WebViewFeature.SAFE_BROWSING_ENABLE))
             WebSettingsCompat.setSafeBrowsingEnabled(settings, safe_browsing);
 
         if (html_dark &&
-                WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK))
+                WebViewEx.isFeatureSupported(WebViewFeature.FORCE_DARK))
             WebSettingsCompat.setForceDark(settings,
                     Helper.isDarkTheme(context) ? FORCE_DARK_ON : FORCE_DARK_OFF);
     }
@@ -309,6 +309,25 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
         return false;
     }
 
+    public static boolean isFeatureSupported(String feature) {
+        try {
+            return WebViewFeature.isFeatureSupported(feature);
+        } catch (Throwable ex) {
+            /*
+                java.lang.ExceptionInInitializerError
+                  at androidx.webkit.internal.WebViewGlueCommunicator.getFactory(SourceFile:1)
+                  at androidx.webkit.internal.WebViewFeatureInternal$LAZY_HOLDER.<clinit>(SourceFile:2)
+                  at androidx.webkit.internal.WebViewFeatureInternal.isSupportedByWebView(SourceFile:1)
+                  at androidx.webkit.internal.WebViewFeatureInternal.isSupported(SourceFile:13)
+                  at androidx.webkit.internal.WebViewFeatureInternal.isSupported(SourceFile:11)
+                  at androidx.webkit.internal.WebViewFeatureInternal.isSupported(SourceFile:4)
+                  at androidx.webkit.WebViewFeature.isFeatureSupported(SourceFile:1)
+             */
+            Log.w(ex);
+            return false;
+        }
+    }
+
     interface IWebView {
         void onSizeChanged(int w, int h, int ow, int oh);