GitLab

at 2025-04-08T17:23:52+00:00

fixup! TB 41668: Tweaks to the Base Browser updater for Tor Browser

TB 43567: Drop torbrowser.post_update.url.

Also, no longer require an override page to be set to open about:tor
after an update.

fixup! TB 7494: Create local home page for TBB.

TB 43567: Use the same update URL in about:tor as the about dialog.

fixup! TB 41435: Add a Tor Browser migration function

TB 43567: Clear torbrowser.post_update.url.

               "%OLD_BASE_BROWSER_VERSION%",

               old_forkVersion

             );

-            if (overridePage && AppConstants.BASE_BROWSER_UPDATE) {

+            if (AppConstants.BASE_BROWSER_UPDATE) {

               // Tor Browser: Instead of opening the post-update "override page"

               // directly, we ensure that about:tor will be opened, which should

               // notify the user that their browser was updated.

-              //

-              // The overridePage comes from the openURL attribute within the

-              // updates.xml file or, if no showURL action is present, from the

-              // startup.homepage_override_url pref.

-              Services.prefs.setCharPref(

-                "torbrowser.post_update.url",

-                overridePage

-              );

+              // NOTE: We ignore any overridePage value, which can come from the

+              // openURL attribute within the updates.xml file.

               Services.prefs.setBoolPref(

                 "torbrowser.post_update.shouldNotify",

                 true

     // Version 6: Tor Browser 14.5a3: Clear preference for TorSettings that is

     //            no longer used (tor-browser#41921).

     //            Drop unused TorConnect setting (tor-browser#43462).

-    const TBB_MIGRATION_VERSION = 6;

+    // Version 6: Tor Browser 14.5a6: Clear home page update url preference

+    //            (tor-browser#43567).

+    const TBB_MIGRATION_VERSION = 7;

     const MIGRATION_PREF = "torbrowser.migration.version";

     // If we decide to force updating users to pass through any version

       Services.prefs.clearUserPref("torbrowser.bootstrap.allow_internet_test");

     }

+    if (currentVersion < 7) {

+      Services.prefs.clearUserPref("torbrowser.post_update.url");

+    }

+

     Services.prefs.setIntPref(MIGRATION_PREF, TBB_MIGRATION_VERSION);

   },

     const shouldNotifyPref = "torbrowser.post_update.shouldNotify";

     if (Services.prefs.getBoolPref(shouldNotifyPref, false)) {

       Services.prefs.clearUserPref(shouldNotifyPref);

+      // Try use the same URL as the about dialog. See tor-browser#43567.

+      let updateURL = Services.urlFormatter.formatURLPref(

+        "app.releaseNotesURL.aboutDialog"

+      );

+      if (updateURL === "about:blank") {

+        updateURL = Services.urlFormatter.formatURLPref(

+          "startup.homepage_override_url"

+        );

+      }

       return {

         updateVersion: Services.prefs.getCharPref(

           "browser.startup.homepage_override.torbrowser.version"

         ),

-        updateURL:

-          Services.prefs.getCharPref("torbrowser.post_update.url", "") ||

-          Services.urlFormatter.formatURLPref("startup.homepage_override_url"),

+        updateURL,

       };

     }

     const number = this._count;

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

Commits:

3 changed files:

Changes: