From 363d0ad89fe48e879ee38fd4d0a9246cc33cae5a Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 14 Feb 2022 10:38:07 +0100
Subject: [PATCH] AMP requires WebView

---
 app/src/main/java/eu/faircode/email/AdapterMessage.java | 4 +++-
 app/src/main/java/eu/faircode/email/Helper.java         | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 6686212d95..2487c7f96b 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2821,7 +2821,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                                     !EntityMessage.SMIME_SIGNENCRYPT.equals(message.encrypt));
 
                     // Show AMP
-                    ibAmp.setVisibility(args.getBoolean("has_amp") ? View.VISIBLE : View.GONE);
+                    boolean has_amp = args.getBoolean("has_amp");
+                    ibAmp.setVisibility(has_amp && Helper.hasWebView(context)
+                            ? View.VISIBLE : View.GONE);
 
                     // Show encrypt actions
                     ibVerify.setVisibility(verifyable ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index ab64d9172f..60b369d336 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -157,6 +157,7 @@ import java.util.concurrent.atomic.AtomicLong;
 import java.util.regex.Pattern;
 
 public class Helper {
+    private static Boolean hasWebView = null;
     private static Boolean hasPlayStore = null;
     private static Boolean hasValidFingerprint = null;
 
@@ -410,6 +411,12 @@ public class Helper {
     }
 
     static boolean hasWebView(Context context) {
+        if (hasWebView == null)
+            hasWebView = _hasWebView(context);
+        return hasWebView;
+    }
+
+    private static boolean _hasWebView(Context context) {
         try {
             PackageManager pm = context.getPackageManager();
             if (pm.hasSystemFeature(PackageManager.FEATURE_WEBVIEW)) {