From 83931fabec690240db86e06b377a7b17f97409c8 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 27 Jan 2019 17:48:41 +0000
Subject: [PATCH] Improved WebView test

---
 .../java/eu/faircode/email/AdapterMessage.java     |  4 +---
 .../java/eu/faircode/email/FragmentWebView.java    | 11 +----------
 app/src/main/java/eu/faircode/email/Helper.java    | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 64c8fc837a..fae27971f2 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2223,9 +2223,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
         this.colorAccent = Helper.resolveColor(context, R.attr.colorAccent);
         this.textColorSecondary = Helper.resolveColor(context, android.R.attr.textColorSecondary);
         this.colorUnread = Helper.resolveColor(context, R.attr.colorUnread);
-
-        PackageManager pm = context.getPackageManager();
-        this.hasWebView = pm.hasSystemFeature("android.software.webview");
+        this.hasWebView = Helper.hasWebView(context);
     }
 
     void submitList(PagedList<TupleMessageEx> pagedList) {
diff --git a/app/src/main/java/eu/faircode/email/FragmentWebView.java b/app/src/main/java/eu/faircode/email/FragmentWebView.java
index d94180df98..012d088309 100644
--- a/app/src/main/java/eu/faircode/email/FragmentWebView.java
+++ b/app/src/main/java/eu/faircode/email/FragmentWebView.java
@@ -28,7 +28,6 @@ import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.util.Base64;
 import android.view.ContextMenu;
-import android.view.InflateException;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -65,15 +64,7 @@ public class FragmentWebView extends FragmentBase {
     @Override
     @Nullable
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        View view = null;
-        try {
-            view = inflater.inflate(R.layout.fragment_webview, container, false);
-        } catch (InflateException ex) {
-            Toast.makeText(getContext(),
-                    getString(R.string.title_no_viewer, Helper.formatThrowable(ex)),
-                    Toast.LENGTH_LONG).show();
-            return null;
-        }
+        View view = inflater.inflate(R.layout.fragment_webview, container, false);
 
         progressBar = view.findViewById(R.id.progressbar);
         webview = view.findViewById(R.id.webview);
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index e386da4a85..5f74600467 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -44,6 +44,7 @@ import android.text.TextUtils;
 import android.view.Menu;
 import android.view.View;
 import android.view.ViewGroup;
+import android.webkit.WebView;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
@@ -861,6 +862,19 @@ public class Helper {
         }
     }
 
+    static boolean hasWebView(Context context) {
+        PackageManager pm = context.getPackageManager();
+        if (pm.hasSystemFeature("android.software.webview"))
+            try {
+                new WebView(context);
+                return true;
+            } catch (Throwable ex) {
+                return false;
+            }
+        else
+            return false;
+    }
+
     public static String getFingerprint(Context context) {
         try {
             PackageManager pm = context.getPackageManager();