From cc2ee5b9c29fbe097db669d7d501c1b54d3c663a Mon Sep 17 00:00:00 2001
From: Matthew Finkel <Matthew.Finkel@gmail.com>
Date: Wed, 11 Apr 2018 18:46:02 +0000
Subject: [PATCH] Bug 25741 - TBA: Do not save browsing history by default

---
 mobile/android/app/src/main/res/xml-v11/preferences_search.xml  | 2 +-
 mobile/android/app/src/main/res/xml/preferences_search.xml      | 2 +-
 .../android/base/java/org/mozilla/gecko/home/BrowserSearch.java | 2 +-
 .../base/java/org/mozilla/gecko/home/SearchEngineRow.java       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mobile/android/app/src/main/res/xml-v11/preferences_search.xml b/mobile/android/app/src/main/res/xml-v11/preferences_search.xml
index 937b05b617c60..a58bb7cece442 100644
--- a/mobile/android/app/src/main/res/xml-v11/preferences_search.xml
+++ b/mobile/android/app/src/main/res/xml-v11/preferences_search.xml
@@ -27,7 +27,7 @@
 
     <CheckBoxPreference android:key="android.not_a_preference.search.search_history.enabled"
                         android:title="@string/pref_history_search_suggestions"
-                        android:defaultValue="true"
+                        android:defaultValue="false"
                         android:persistent="true" />
 
 </PreferenceScreen>
diff --git a/mobile/android/app/src/main/res/xml/preferences_search.xml b/mobile/android/app/src/main/res/xml/preferences_search.xml
index 440167fe5e2a1..fc8c258821e10 100644
--- a/mobile/android/app/src/main/res/xml/preferences_search.xml
+++ b/mobile/android/app/src/main/res/xml/preferences_search.xml
@@ -34,7 +34,7 @@
 
     <CheckBoxPreference android:key="android.not_a_preference.search.search_history.enabled"
                         android:title="@string/pref_history_search_suggestions"
-                        android:defaultValue="true"
+                        android:defaultValue="false"
                         android:persistent="true" />
 
 </PreferenceScreen>
diff --git a/mobile/android/base/java/org/mozilla/gecko/home/BrowserSearch.java b/mobile/android/base/java/org/mozilla/gecko/home/BrowserSearch.java
index 386f0494b75c7..9e415cb454d78 100644
--- a/mobile/android/base/java/org/mozilla/gecko/home/BrowserSearch.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/BrowserSearch.java
@@ -278,7 +278,7 @@ public class BrowserSearch extends HomeFragment
         super.onResume();
 
         final SharedPreferences prefs = GeckoSharedPrefs.forApp(getContext());
-        mSavedSearchesEnabled = prefs.getBoolean(GeckoPreferences.PREFS_HISTORY_SAVED_SEARCH, true);
+        mSavedSearchesEnabled = prefs.getBoolean(GeckoPreferences.PREFS_HISTORY_SAVED_SEARCH, false);
 
         // Fetch engines if we need to.
         if (mSearchEngines.isEmpty() || !Locale.getDefault().equals(mLastLocale)) {
diff --git a/mobile/android/base/java/org/mozilla/gecko/home/SearchEngineRow.java b/mobile/android/base/java/org/mozilla/gecko/home/SearchEngineRow.java
index 8d7eec1d839a5..1d90f7bacf41c 100644
--- a/mobile/android/base/java/org/mozilla/gecko/home/SearchEngineRow.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/SearchEngineRow.java
@@ -378,7 +378,7 @@ class SearchEngineRow extends ThemedRelativeLayout {
 
         final int recycledSuggestionCount = mSuggestionView.getChildCount();
         final SharedPreferences prefs = GeckoSharedPrefs.forApp(getContext());
-        final boolean savedSearchesEnabled = prefs.getBoolean(GeckoPreferences.PREFS_HISTORY_SAVED_SEARCH, true);
+        final boolean savedSearchesEnabled = prefs.getBoolean(GeckoPreferences.PREFS_HISTORY_SAVED_SEARCH, false);
 
         // Remove duplicates of search engine suggestions from saved searches.
         List<String> searchHistorySuggestions = (rawSearchHistorySuggestions != null) ? rawSearchHistorySuggestions : new ArrayList<String>();
-- 
GitLab