Merge pull request #14398 from brave/FIX_for_23919_fingerprinting_for…

…_language Fix for 23919 fingerprint for language
brave · Aug 9, 2022 · 009d932 · 009d932
2 parents 95a3a84 + d9759ae
commit 009d932
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 2 deletions.
diff --git a/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
@@ -50,6 +50,7 @@ public class BravePrivacySettings extends PrivacySettings {
     private static final String PREF_HTTPS_FIRST_MODE = "https_first_mode";
     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
     private static final String PREF_PHONE_AS_A_SECURITY_KEY = "phone_as_a_security_key";
+    private static final String PREF_FINGERPRINT_LANGUAGE = "fingerprint_language";
 
     // brave Prefs
     private static final String PREF_BRAVE_SHIELDS_GLOBALS_SECTION =
@@ -95,7 +96,7 @@ public class BravePrivacySettings extends PrivacySettings {
             PREF_BRAVE_SHIELDS_GLOBALS_SECTION, //  shields globals  section
             PREF_SHIELDS_SUMMARY, PREF_BLOCK_TRACKERS_ADS, PREF_DE_AMP, PREF_HTTPSE,
             PREF_HTTPS_FIRST_MODE, PREF_BLOCK_SCRIPTS, PREF_BLOCK_CROSS_SITE_COOKIES,
-            PREF_FINGERPRINTING_PROTECTION,
+            PREF_FINGERPRINTING_PROTECTION, PREF_FINGERPRINT_LANGUAGE,
             PREF_CLEAR_DATA_SECTION, //  clear data automatically  section
             PREF_CLEAR_ON_EXIT, PREF_CLEAR_BROWSING_DATA,
             PREF_BRAVE_SOCIAL_BLOCKING_SECTION, // social blocking section
@@ -145,6 +146,7 @@ public class BravePrivacySettings extends PrivacySettings {
     private ChromeBasePreference mWebrtcPolicy;
     private ChromeSwitchPreference mClearBrowsingDataOnExit;
     private Preference mUstoppableDomains;
+    private ChromeSwitchPreference mFingerprntLanguagePref;
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -187,6 +189,10 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
                 (BraveDialogPreference) findPreference(PREF_FINGERPRINTING_PROTECTION);
         mFingerprintingProtectionPref.setOnPreferenceChangeListener(this);
 
+        mFingerprntLanguagePref =
+                (ChromeSwitchPreference) findPreference(PREF_FINGERPRINT_LANGUAGE);
+        mFingerprntLanguagePref.setOnPreferenceChangeListener(this);
+
         mCloseTabsOnExitPref = (ChromeSwitchPreference) findPreference(PREF_CLOSE_TABS_ON_EXIT);
         mCloseTabsOnExitPref.setOnPreferenceChangeListener(this);
 
@@ -311,6 +317,9 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                         R.string.block_fingerprinting_option_3));
                 mFingerprintingProtectionPref.setCheckedIndex(2);
             }
+        } else if (PREF_FINGERPRINT_LANGUAGE.equals(key)) {
+            UserPrefs.get(Profile.getLastUsedRegularProfile())
+                    .setBoolean(BravePref.REDUCE_LANGUAGE_ENABLED, (boolean) newValue);
         } else if (PREF_BLOCK_CROSS_SITE_COOKIES.equals(key)) {
             if ((int) newValue == 0) {
                 BravePrefServiceBridge.getInstance().setCookiesBlockType(
@@ -510,6 +519,8 @@ private void updateBravePreferences() {
         mSearchSuggestions.setEnabled(autocompleteEnabled);
         mAutocompleteTopSites.setEnabled(autocompleteEnabled);
         mAutocompleteBraveSuggestedSites.setEnabled(autocompleteEnabled);
+        mFingerprntLanguagePref.setChecked(UserPrefs.get(Profile.getLastUsedRegularProfile())
+                                                   .getBoolean(BravePref.REDUCE_LANGUAGE_ENABLED));
     }
 
     private void removePreferenceIfPresent(String key) {

diff --git a/android/java/res/xml/brave_privacy_preferences.xml b/android/java/res/xml/brave_privacy_preferences.xml
@@ -46,6 +46,11 @@
             app:dialog_subtitle="@string/block_fingerprinting_text"
             app:dialog_entries="@array/blockFingerprintingTexts"
             app:dialog_default_index="1" />
+        <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+            android:key="fingerprint_language"
+            android:title="@string/fingerprint_language_switch"
+            android:summary="@string/fingerprint_language_switch_summary"
+            android:defaultValue="false" />
         <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
             android:key="de_amp"
             android:title="@string/de_amp_switch"

diff --git a/android/javatests/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsTest.java b/android/javatests/org/chromium/chrome/browser/privacy/settings/BravePrivacySettingsTest.java
@@ -46,7 +46,7 @@ public class BravePrivacySettingsTest {
     private static final String PREF_INCOGNITO_LOCK = "incognito_lock";
     private static final String PREF_PHONE_AS_A_SECURITY_KEY = "phone_as_a_security_key";
 
-    private static int BRAVE_PRIVACY_SETTINGS_NUMBER_OF_ITEMS = 22;
+    private static int BRAVE_PRIVACY_SETTINGS_NUMBER_OF_ITEMS = 23;
 
     private int mItemsLeft;
 

diff --git a/browser/android/preferences/BUILD.gn b/browser/android/preferences/BUILD.gn
@@ -33,6 +33,7 @@ source_set("preferences") {
 java_cpp_strings("java_pref_names_srcjar") {
   sources = [
     "//brave/components/brave_rewards/common/pref_names.cc",
+    "//brave/components/brave_shields/common/pref_names.cc",
     "//brave/components/constants/pref_names.cc",
     "//brave/components/ntp_background_images/common/pref_names.cc",
     "//brave/components/omnibox/browser/brave_omnibox_prefs.cc",

diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd
@@ -1193,6 +1193,12 @@ Are you sure you want to do this?
       <message name="IDS_SHIELDS_SUMMARY" desc="Title for shields option.">
         These are the default Shields settings for new sites. Changing these won't affect your existing per-site settings.
       </message>
+      <message name="IDS_FINGERPRINT_LANGUAGE_SWITCH" desc="Title for fingerprint language switch">
+        Prevent fingerprinting via language settings
+      </message>
+      <message name="IDS_FINGERPRINT_LANGUAGE_SWITCH_SUMMARY" desc="Title for shields option fingerprint language">
+        Reduces how much websites can learn about you based on your browser's language settings.
+      </message>
       <message name="IDS_BLOCK_FINGERPRINTING_TEXT" desc="Text for shields option.">
         Prevents browser from recognizing your device
       </message>