Pier Angelo Vendrame pushed to branch tor-browser-102.9.0esr-12.5-1 at The Tor Project / Applications / Tor Browser

Commits: eff20896 by Pier Angelo Vendrame at 2023-03-22T15:40:02+01:00 fixup! Firefox preference overrides.

Bug 41689: Do not customize startup.homepage_override_url in Base Browser.

- - - - - 2af5abfc by Pier Angelo Vendrame at 2023-03-22T15:42:49+01:00 fixup! Bug 2176: Rebrand Firefox to TorBrowser

Bug 41689: Move the generic updated URL to the right place

- - - - -

4 changed files:

- browser/app/profile/001-base-profile.js - browser/branding/tb-alpha/pref/firefox-branding.js - browser/branding/tb-nightly/pref/firefox-branding.js - browser/branding/tb-release/pref/firefox-branding.js

Changes:

===================================== browser/app/profile/001-base-profile.js ===================================== @@ -17,13 +17,6 @@ pref("startup.homepage_welcome_url.additional", ""); // Disable Firefox Welcome Dialog pref("browser.aboutwelcome.enabled", false);

-// Set a generic, default URL that will be opened in a tab after an update. -// Typically, this will not be used; instead, the <update> element within -// each update manifest should contain attributes similar to: -// actions="showURL" -// openURL="https://blog.torproject.org/tor-browser-55a2-released" -pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); - // Bug 41668: allow users to apply updates. This is set also in firefox.js for // all platforms, except for Windows. As explained on firefox.js, Firefox uses a // per-installation preference on Windows. However, we patch this behavior, and

===================================== browser/branding/tb-alpha/pref/firefox-branding.js ===================================== @@ -4,11 +4,16 @@

// This file contains branding-specific prefs.

-pref("startup.homepage_override_url", "https://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OLD..."); -pref("startup.homepage_welcome_url", "https://www.mozilla.org/projects/firefox/%VERSION%/firstrun/"); +// Set a generic, default URL that will be opened in a tab after an update. +// Typically, this will not be used; instead, the <update> element within +// each update manifest should contain attributes similar to: +// actions="showURL" +// openURL="https://blog.torproject.org/tor-browser-55a2-released" +pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); +pref("startup.homepage_welcome_url", "about:welcome"); pref("startup.homepage_welcome_url.additional", ""); // The time interval between checks for a new version (in seconds) -pref("app.update.interval", 7200); // 2 hours +pref("app.update.interval", 43200); // 12 hours // Give the user x seconds to react before showing the big UI. default=12 hours pref("app.update.promptWaitTime", 43200); // URL user can browse to manually if for some reason all update installation

===================================== browser/branding/tb-nightly/pref/firefox-branding.js ===================================== @@ -4,11 +4,16 @@

// This file contains branding-specific prefs.

-pref("startup.homepage_override_url", "https://www.mozilla.org/projects/firefox/%VERSION%/whatsnew/?oldversion=%OLD..."); -pref("startup.homepage_welcome_url", "https://www.mozilla.org/projects/firefox/%VERSION%/firstrun/"); +// Set a generic, default URL that will be opened in a tab after an update. +// Typically, this will not be used; instead, the <update> element within +// each update manifest should contain attributes similar to: +// actions="showURL" +// openURL="https://blog.torproject.org/tor-browser-55a2-released" +pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); +pref("startup.homepage_welcome_url", "about:welcome"); pref("startup.homepage_welcome_url.additional", ""); // The time interval between checks for a new version (in seconds) -pref("app.update.interval", 7200); // 2 hours +pref("app.update.interval", 14400); // 4 hours // Give the user x seconds to react before showing the big UI. default=12 hours pref("app.update.promptWaitTime", 43200); // URL user can browse to manually if for some reason all update installation

===================================== browser/branding/tb-release/pref/firefox-branding.js ===================================== @@ -4,7 +4,12 @@

// This file contains branding-specific prefs.

-pref("startup.homepage_override_url", ""); +// Set a generic, default URL that will be opened in a tab after an update. +// Typically, this will not be used; instead, the <update> element within +// each update manifest should contain attributes similar to: +// actions="showURL" +// openURL="https://blog.torproject.org/tor-browser-55a2-released" +pref("startup.homepage_override_url", "https://blog.torproject.org/category/applications"); pref("startup.homepage_welcome_url", "about:welcome"); pref("startup.homepage_welcome_url.additional", ""); // Interval: Time between checks for a new version (in seconds)

View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/cbc8642...