[tor-commits] [tor-browser/tor-browser-84.0-10.5-1] Bug 40198: Expose privacy.spoof_english pref in GeckoView

[sysrqb at torproject.org]

commit 1804df49303216821c532298ff01243a01ffc1a6
Author: Alex Catarineu <acat at torproject.org>
Date:   Sun Oct 18 17:06:04 2020 +0200

    Bug 40198: Expose privacy.spoof_english pref in GeckoView
---
 mobile/android/geckoview/api.txt                   |  3 ++
 .../mozilla/geckoview/GeckoRuntimeSettings.java    | 33 ++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/mobile/android/geckoview/api.txt b/mobile/android/geckoview/api.txt
index 946446a97f30..2b394bca70b3 100644
--- a/mobile/android/geckoview/api.txt
+++ b/mobile/android/geckoview/api.txt
@@ -632,6 +632,7 @@ package org.mozilla.geckoview {
     method public boolean getRemoteDebuggingEnabled();
     method @Nullable public GeckoRuntime getRuntime();
     method @Nullable public Rect getScreenSizeOverride();
+    method public boolean getSpoofEnglish();
     method @Nullable public RuntimeTelemetry.Delegate getTelemetryDelegate();
     method public int getTorSecurityLevel();
     method public boolean getUseMaxScreenDepth();
@@ -651,6 +652,7 @@ package org.mozilla.geckoview {
     method @NonNull public GeckoRuntimeSettings setLoginAutofillEnabled(boolean);
     method @NonNull public GeckoRuntimeSettings setPreferredColorScheme(int);
     method @NonNull public GeckoRuntimeSettings setRemoteDebuggingEnabled(boolean);
+    method @NonNull public GeckoRuntimeSettings setSpoofEnglish(boolean);
     method @NonNull public GeckoRuntimeSettings setTorSecurityLevel(int);
     method @NonNull public GeckoRuntimeSettings setWebFontsEnabled(boolean);
     method @NonNull public GeckoRuntimeSettings setWebManifestEnabled(boolean);
@@ -686,6 +688,7 @@ package org.mozilla.geckoview {
     method @NonNull public GeckoRuntimeSettings.Builder preferredColorScheme(int);
     method @NonNull public GeckoRuntimeSettings.Builder remoteDebuggingEnabled(boolean);
     method @NonNull public GeckoRuntimeSettings.Builder screenSizeOverride(int, int);
+    method @NonNull public GeckoRuntimeSettings.Builder spoofEnglish(boolean);
     method @NonNull public GeckoRuntimeSettings.Builder telemetryDelegate(@NonNull RuntimeTelemetry.Delegate);
     method @NonNull public GeckoRuntimeSettings.Builder torSecurityLevel(int);
     method @NonNull public GeckoRuntimeSettings.Builder useMaxScreenDepth(boolean);
diff --git a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
index bb992733937e..e6493f8cddb3 100644
--- a/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
+++ b/mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
@@ -457,6 +457,17 @@ public final class GeckoRuntimeSettings extends RuntimeSettings {
             getSettings().mTorSecurityLevel.set(level);
             return this;
         }
+
+        /**
+         * Sets whether we should spoof locale to English for webpages.
+         *
+         * @param flag True if we should spoof locale to English for webpages, false otherwise.
+         * @return This Builder instance.
+         */
+        public @NonNull Builder spoofEnglish(final boolean flag) {
+            getSettings().mSpoofEnglish.set(flag ? 2 : 1);
+            return this;
+        }
     }
 
     private GeckoRuntime mRuntime;
@@ -507,6 +518,8 @@ public final class GeckoRuntimeSettings extends RuntimeSettings {
         "signon.autofillForms", true);
     /* package */ final Pref<Integer> mTorSecurityLevel = new Pref<>(
         "extensions.torbutton.security_slider", 4);
+    /* package */ final Pref<Integer> mSpoofEnglish = new Pref<>(
+        "privacy.spoof_english", 0);
 
     /* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM;
 
@@ -1171,6 +1184,26 @@ public final class GeckoRuntimeSettings extends RuntimeSettings {
         return this;
     }
 
+    /**
+     * Get whether we should spoof locale to English for webpages.
+     *
+     * @return Whether we should spoof locale to English for webpages.
+     */
+    public boolean getSpoofEnglish() {
+        return mSpoofEnglish.get() == 2;
+    }
+
+    /**
+     * Set whether we should spoof locale to English for webpages.
+     *
+     * @param flag A flag determining whether we should locale to English for webpages.
+     * @return This GeckoRuntimeSettings instance.
+     */
+    public @NonNull GeckoRuntimeSettings setSpoofEnglish(final boolean flag) {
+        mSpoofEnglish.commit(flag ? 2 : 1);
+        return this;
+    }
+
     @Override // Parcelable
     public void writeToParcel(final Parcel out, final int flags) {
         super.writeToParcel(out, flags);