Verified Commit 5cd63445 authored by ma1's avatar ma1 Committed by Pier Angelo Vendrame
Browse files

Bug 42084: Ensure English spoofing works even if preferences are set out of order.

parent 483bad60

toolkit/components/resistfingerprinting/RFPHelper.jsm

+7 −0
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ class _RFPHelper { 
    // Add RFP and Letterboxing observers if prefs are enabled

    this._handleResistFingerprintingChanged();

    this._handleLetterboxingPrefChanged();



    // Synchronize language preferences if accidentally messed up (tor-browser#42084)

    this._handleSpoofEnglishChanged();

  }



  uninit() {
@@ -121,6 +124,7 @@ class _RFPHelper { 
        this._handleResistFingerprintingChanged();

        break;

      case kPrefSpoofEnglish:

      case "intl.accept_languages":

        this._handleSpoofEnglishChanged();

        break;

      case kPrefLetterboxing:
@@ -167,6 +171,7 @@ class _RFPHelper { 
  }



  _handleSpoofEnglishChanged() {

    Services.prefs.removeObserver("intl.accept_languages", this);

    switch (Services.prefs.getIntPref(kPrefSpoofEnglish)) {

      case 0: // will prompt

      // This should only happen when turning privacy.resistFingerprinting off.
@@ -185,6 +190,8 @@ class _RFPHelper { 
      case 2: // spoof

        Services.prefs.setCharPref("intl.accept_languages", "en-US, en");

        Services.prefs.setBoolPref("javascript.use_us_english_locale", true);

        // Ensure spoofing works if preferences are set out of order

        Services.prefs.addObserver("intl.accept_languages", this);

        break;

      default:

        break;