Commit 497e698d authored by Alex Catarineu's avatar Alex Catarineu Committed by jwilde
Browse files

BB 30605: Honor privacy.spoof_english in Android 

This checks `privacy.spoof_english` whenever `setLocales` is
called from Fenix side and sets `intl.accept_languages`
accordingly.

Bug 40198: Expose privacy.spoof_english pref in GeckoView
parent 1c718908

mobile/android/geckoview/api.txt

+3 −0
Original line number Diff line number Diff line
@@ -1095,6 +1095,7 @@ package org.mozilla.geckoview { 
    method @NonNull public boolean getSameDocumentNavigationOverridesLoadType();

    method @NonNull public String getSameDocumentNavigationOverridesLoadTypeForceDisable();

    method @Nullable public Rect getScreenSizeOverride();

    method public boolean getSpoofEnglish();

    method public boolean getTranslationsOfferPopup();

    method @NonNull public List<String> getTrustedRecursiveResolverExcludedDomains();

    method @NonNull public String getTrustedRecursiveResolverUri();
@@ -1150,6 +1151,7 @@ package org.mozilla.geckoview { 
    method @NonNull public GeckoRuntimeSettings setRemoteSettingCrashPullNeverShowAgain(boolean);

    method @NonNull public GeckoRuntimeSettings setSameDocumentNavigationOverridesLoadType(boolean);

    method @NonNull public GeckoRuntimeSettings setSameDocumentNavigationOverridesLoadTypeForceDisable(@NonNull String);

    method @NonNull public GeckoRuntimeSettings setSpoofEnglish(boolean);

    method @NonNull public GeckoRuntimeSettings setTranslationsOfferPopup(boolean);

    method @NonNull public GeckoRuntimeSettings setTrustedRecursiveResolverExcludedDomains(@NonNull List<String>);

    method @NonNull public GeckoRuntimeSettings setTrustedRecursiveResolverMode(int);
@@ -1225,6 +1227,7 @@ package org.mozilla.geckoview { 
    method @NonNull public GeckoRuntimeSettings.Builder setLnaEnabled(@NonNull Boolean);

    method @NonNull public GeckoRuntimeSettings.Builder setSameDocumentNavigationOverridesLoadType(boolean);

    method @NonNull public GeckoRuntimeSettings.Builder setSameDocumentNavigationOverridesLoadTypeForceDisable(@NonNull String);

    method @NonNull public GeckoRuntimeSettings.Builder spoofEnglish(boolean);

    method @NonNull public GeckoRuntimeSettings.Builder translationsOfferPopup(boolean);

    method @NonNull public GeckoRuntimeSettings.Builder trustedRecursiveResolverMode(int);

    method @NonNull public GeckoRuntimeSettings.Builder trustedRecursiveResolverUri(@NonNull String);

mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java

+32 −0
Original line number Diff line number Diff line
@@ -724,6 +724,17 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { 


      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;
@@ -855,6 +866,7 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { 
      new PrefWithoutDefault<Boolean>("browser.crashReports.requestedNeverShowAgain");

  /* package */ final PrefWithoutDefault<String> mCrliteChannel =

      new PrefWithoutDefault<String>("security.pki.crlite_channel");

  /* package */ final Pref<Integer> mSpoofEnglish = new Pref<>("privacy.spoof_english", 0);



  /* package */ int mPreferredColorScheme = COLOR_SCHEME_SYSTEM;
@@ -2545,6 +2557,26 @@ public final class GeckoRuntimeSettings extends RuntimeSettings { 
    return mAppZygoteProcess;

  }



  /**

   * 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);

mobile/shared/components/geckoview/GeckoViewStartup.sys.mjs

+5 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ ChromeUtils.defineESModuleGetters(lazy, { 
  DoHController: "moz-src:///toolkit/components/doh/DoHController.sys.mjs",

  EventDispatcher: "resource://gre/modules/Messaging.sys.mjs",

  PdfJs: "resource://pdf.js/PdfJs.sys.mjs",

  RFPHelper: "resource://gre/modules/RFPHelper.sys.mjs",

});



const { debug, warn } = GeckoViewUtils.initLogging("Startup");
@@ -380,6 +381,10 @@ export class GeckoViewStartup { 
        if (aData.requestedLocales) {

          Services.locale.requestedLocales = aData.requestedLocales;

        }

        lazy.RFPHelper._handleSpoofEnglishChanged();

        if (Services.prefs.getIntPref("privacy.spoof_english", 0) === 2) {

          break;

        }

        const pls = Cc["@mozilla.org/pref-localizedstring;1"].createInstance(

          Ci.nsIPrefLocalizedString

        );