From c98418ad56c939fd773c2b7a1ca63a0a70feea42 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 25 Mar 2020 21:56:49 +0100
Subject: [PATCH] Disable Safe browsing by default

---
 app/src/main/AndroidManifest.xml                                | 2 +-
 app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java | 2 +-
 app/src/main/java/eu/faircode/email/WebViewEx.java              | 2 +-
 app/src/main/res/layout/fragment_options_privacy.xml            | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 60b64e6b22..0fff8c1ebc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -55,7 +55,7 @@
             android:value="true" />
         <meta-data
             android:name="android.webkit.WebView.EnableSafeBrowsing"
-            android:value="true" />
+            android:value="false" />
         <meta-data
             android:name="android.allow_multiple_resumed_activities"
             android:value="true" />
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
index 31198f85de..d6dbc5e68d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsPrivacy.java
@@ -267,7 +267,7 @@ public class FragmentOptionsPrivacy extends FragmentBase implements SharedPrefer
 
         swDisplayHidden.setChecked(prefs.getBoolean("display_hidden", false));
         swSecure.setChecked(prefs.getBoolean("secure", false));
-        swSafeBrowsing.setChecked(prefs.getBoolean("safe_browsing", true));
+        swSafeBrowsing.setChecked(prefs.getBoolean("safe_browsing", false));
     }
 
     public static class FragmentDialogPin extends FragmentDialogBase {
diff --git a/app/src/main/java/eu/faircode/email/WebViewEx.java b/app/src/main/java/eu/faircode/email/WebViewEx.java
index b5d9ecd311..cd66b5cf82 100644
--- a/app/src/main/java/eu/faircode/email/WebViewEx.java
+++ b/app/src/main/java/eu/faircode/email/WebViewEx.java
@@ -59,7 +59,7 @@ public class WebViewEx extends WebView implements DownloadListener, View.OnLongC
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-            boolean safe_browsing = prefs.getBoolean("safe_browsing", true);
+            boolean safe_browsing = prefs.getBoolean("safe_browsing", false);
             settings.setSafeBrowsingEnabled(safe_browsing);
         }
     }
diff --git a/app/src/main/res/layout/fragment_options_privacy.xml b/app/src/main/res/layout/fragment_options_privacy.xml
index 8a1ed89d4a..485d81088d 100644
--- a/app/src/main/res/layout/fragment_options_privacy.xml
+++ b/app/src/main/res/layout/fragment_options_privacy.xml
@@ -245,7 +245,6 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
-            android:checked="true"
             android:text="@string/title_advanced_safe_browsing"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"