Check if safe browsing can be enabled

3 years ago · 400c135530
parent db553478f4
commit 400c135530
2 changed files with 4 additions and 4 deletions
--- a/app/src/main/java/eu/faircode/email/ActivityAMP.java
+++ b/app/src/main/java/eu/faircode/email/ActivityAMP.java
@ -102,8 +102,8 @@ public class ActivityAMP extends ActivityBase {
        settings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
        settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-            settings.setSafeBrowsingEnabled(safe_browsing);
+        if (WebViewEx.isFeatureSupported(WebViewFeature.SAFE_BROWSING_ENABLE))
+            WebSettingsCompat.setSafeBrowsingEnabled(settings, safe_browsing);

        setDarkMode();

--- a/app/src/main/java/eu/faircode/email/FragmentDialogOpenFull.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogOpenFull.java
@ -82,8 +82,8 @@ public class FragmentDialogOpenFull extends FragmentDialogBase {
        settings.setCacheMode(WebSettings.LOAD_CACHE_ELSE_NETWORK);
        settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
-            settings.setSafeBrowsingEnabled(safe_browsing);
+        if (WebViewEx.isFeatureSupported(WebViewFeature.SAFE_BROWSING_ENABLE))
+            WebSettingsCompat.setSafeBrowsingEnabled(settings, safe_browsing);

        boolean dark = (Helper.isDarkTheme(context) && !force_light);
        if (WebViewEx.isFeatureSupported(WebViewFeature.FORCE_DARK))