From 900348b9d8cbd7999be45edd7c1bdbc9950f4d6b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 10 Jul 2020 09:12:24 +0200
Subject: [PATCH] Prevent crash

---
 .../main/java/eu/faircode/email/Helper.java   | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 08039aefa5..d884df721c 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -371,16 +371,24 @@ public class Helper {
     }
 
     static boolean hasWebView(Context context) {
-        PackageManager pm = context.getPackageManager();
-        if (pm.hasSystemFeature(PackageManager.FEATURE_WEBVIEW))
-            try {
+        try {
+            PackageManager pm = context.getPackageManager();
+            if (pm.hasSystemFeature(PackageManager.FEATURE_WEBVIEW)) {
                 new WebView(context);
                 return true;
-            } catch (Throwable ex) {
+            } else
                 return false;
-            }
-        else
+        } catch (Throwable ex) {
+            /*
+                Caused by: java.lang.RuntimeException: Package manager has died
+                    at android.app.ApplicationPackageManager.hasSystemFeature(ApplicationPackageManager.java:414)
+                    at eu.faircode.email.Helper.hasWebView(SourceFile:375)
+                    at eu.faircode.email.ApplicationEx.onCreate(SourceFile:110)
+                    at android.app.Instrumentation.callApplicationOnCreate(Instrumentation.java:1014)
+                    at android.app.ActivityThread.handleBindApplication(ActivityThread.java:4751)
+             */
             return false;
+        }
     }
 
     static boolean canPrint(Context context) {