diff --git a/app/src/main/java/eu/faircode/email/DebugHelper.java b/app/src/main/java/eu/faircode/email/DebugHelper.java index e8079d693b..b15591bf5e 100644 --- a/app/src/main/java/eu/faircode/email/DebugHelper.java +++ b/app/src/main/java/eu/faircode/email/DebugHelper.java @@ -518,9 +518,10 @@ public class DebugHelper { WebViewEx.isFeatureSupported(context, WebViewFeature.ALGORITHMIC_DARKENING))); try { PackageInfo pkg = WebViewCompat.getCurrentWebViewPackage(context); - sb.append(String.format("WebView %d/%s\r\n", + sb.append(String.format("WebView %d/%s has=%b\r\n", pkg == null ? -1 : pkg.versionCode, - pkg == null ? null : pkg.versionName)); + pkg == null ? null : pkg.versionName, + Helper.hasWebView(context))); } catch (Throwable ex) { sb.append(ex).append("\r\n"); } diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 6c73837e46..4853602a1f 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -132,7 +132,6 @@ import androidx.preference.PreferenceManager; import androidx.recyclerview.selection.SelectionTracker; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.PagerAdapter; -import androidx.webkit.WebViewCompat; import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.snackbar.Snackbar; @@ -568,11 +567,6 @@ public class Helper { private static boolean _hasWebView(Context context) { try { - // Canary 127.0.6510.0 is broken - PackageInfo pkg = WebViewCompat.getCurrentWebViewPackage(context); - if (pkg != null && pkg.getLongVersionCode() == 651000033) - return false; - PackageManager pm = context.getPackageManager(); if (pm.hasSystemFeature(PackageManager.FEATURE_WEBVIEW)) { WebView view = new WebView(context); @@ -581,6 +575,7 @@ public class Helper { } else return false; } catch (Throwable ex) { + Log.w(ex); /* Caused by: java.lang.RuntimeException: Package manager has died at android.app.ApplicationPackageManager.hasSystemFeature(ApplicationPackageManager.java:414)