Commit 953f36bc authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by morgan
Browse files

fixup! TB 40562: Added Tor Browser preferences to 000-tor-browser.js 

TB 45276: Deprecate the Android-specific pref file.

We are importing our main preference file anyway, which has higher
visibility to all devs.
parent ecc93d07

.prettierignore

+0 −1
Changes for .prettierignore: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1816,7 +1816,6 @@ browser/app/profile/001-base-profile.js 
browser/app/profile/000-tor-browser.js

# We do not use the preprocessor here, so we can lint it.

!browser/components/torpreferences/content/connectionPane.inc.xhtml

mobile/android/app/000-tor-browser-android.js

toolkit/content/pt_config.json

toolkit/content/moat_countries_dev_build.json

toolkit/components/lox/lox_wasm.jsm

eslint-ignores.config.mjs

+0 −1
Changes for eslint-ignores.config.mjs: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -310,7 +310,6 @@ export default [ 


  "browser/app/profile/001-base-profile.js",

  "browser/app/profile/000-tor-browser.js",

  "mobile/android/app/000-tor-browser-android.js",

  "toolkit/content/pt_config.json",

  "toolkit/content/moat_contries_dev_build.json",

  "toolkit/components/lox/lox_wasm.jsm",

mobile/android/app/000-tor-browser-android.js

deleted100644 → 0
+0 −20
Changes for mobile/android/app/000-tor-browser-android.js: 0 added lines, 20 removed lines.
Original line number Diff line number Diff line 
// Import all prefs from the canonical file

// We override mobile-specific prefs below

// Tor Browser for Android

// Do not edit this file.



#include ../../../browser/app/profile/000-tor-browser.js



// Disable browser auto updaters

pref("app.update.auto", false);

pref("browser.startup.homepage_override.mstone", "ignore");



// controls if we want camera support

pref("media.realtime_decoder.enabled", false);



// No HLS support for now due to browser freezing, see: #29859.

pref("media.hls.enabled", false);



// Disable WebAuthn. It requires Google Play Services, so it isn't

// available, but avoid any potential problems.

pref("security.webauth.webauthn_enable_android_fido2", false);

mobile/android/app/geckoview-prefs.js

+0 −2
Changes for mobile/android/app/geckoview-prefs.js: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -388,5 +388,3 @@ pref("xpinstall.whitelist.fileRequest", false); 
pref("browser.ipProtection.enabled", true);

pref("browser.ipProtection.guardian.endpoint", "https://vpn.mozilla.org/");

pref("toolkit.ipProtection.android.authProvider", "fxa");
 


#include 000-tor-browser-android.js

mobile/android/app/moz.build

+1 −1
Changes for mobile/android/app/moz.build: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ if CONFIG["MOZ_PKG_SPECIAL"]: 
    DEFINES["MOZ_PKG_SPECIAL"] = CONFIG["MOZ_PKG_SPECIAL"]



JS_PREFERENCE_PP_FILES += [

    "000-tor-browser-android.js",

    "../../../browser/app/profile/000-tor-browser.js",

]



if not CONFIG["MOZ_ANDROID_FAT_AAR_ARCHITECTURES"]: