Improved WebView test

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);
-
+        this.hasWebView = Helper.hasWebView(context);
-        PackageManager pm = context.getPackageManager();
-        this.hasWebView = pm.hasSystemFeature("android.software.webview");
     }
 
     void submitList(PagedList<TupleMessageEx> pagedList) {

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;
+        View view = inflater.inflate(R.layout.fragment_webview, container, false);
-        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;
-        }
 
         progressBar = view.findViewById(R.id.progressbar);
         webview = view.findViewById(R.id.webview);

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();