[tbb-commits] [tor-browser/tor-browser-60.1.0esr-8.0-1] Bug 25741 - TBA: Do not save browsing history by default

[gk at torproject.org]

commit 694a7f174bc0214fec5a46893d11342fb1156936
Author: Matthew Finkel <Matthew.Finkel at gmail.com>
Date:   Wed Apr 11 18:46:02 2018 +0000

    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 +-
 .../app/src/photon/java/org/mozilla/gecko/home/SearchEngineRow.java   | 2 +-
 mobile/android/base/java/org/mozilla/gecko/home/BrowserSearch.java    | 4 ++--
 4 files changed, 5 insertions(+), 5 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 937b05b617c6..a58bb7cece44 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 440167fe5e2a..fc8c258821e1 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/app/src/photon/java/org/mozilla/gecko/home/SearchEngineRow.java b/mobile/android/app/src/photon/java/org/mozilla/gecko/home/SearchEngineRow.java
index 8d7eec1d839a..1d90f7bacf41 100644
--- a/mobile/android/app/src/photon/java/org/mozilla/gecko/home/SearchEngineRow.java
+++ b/mobile/android/app/src/photon/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>();
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 e25d1067a995..02cd3888ed15 100644
--- a/mobile/android/base/java/org/mozilla/gecko/home/BrowserSearch.java
+++ b/mobile/android/base/java/org/mozilla/gecko/home/BrowserSearch.java
@@ -276,7 +276,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)) {
@@ -1385,4 +1385,4 @@ public class BrowserSearch extends HomeFragment
             setSelector(isPrivate ? R.drawable.search_list_selector_private : R.drawable.search_list_selector);
         }
     }
-}
\ No newline at end of file
+}