Commit 2909cc84 authored by henry's avatar henry
Browse files

fixup! MB 39: Add home page about:mullvad-browser 

TB 43929: Update about:mullvad-browser override page logic for ESR 140.

TB 42738: Move these changes to the about:mullvad-browser commit.
parent 97229a59

browser/components/BrowserContentHandler.sys.mjs

+24 −0
Changes for browser/components/BrowserContentHandler.sys.mjs: 24 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -781,6 +781,7 @@ nsBrowserContentHandler.prototype = { 
    var overridePage = "";

    var additionalPage = "";

    var willRestoreSession = false;

    let openAboutMullvadBrowser = false;

    try {

      // Read the old value of homepage_override.mstone before

      // needHomepageOverride updates it, so that we can later add it to the
@@ -976,6 +977,19 @@ nsBrowserContentHandler.prototype = { 
              "%OLD_BASE_BROWSER_VERSION%",

              old_forkVersion

            );

            if (AppConstants.BASE_BROWSER_UPDATE) {

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

              // openURL attribute within the updates.xml file.

              // Mullvad Browser, copied from tor-browser: Instead of opening

              // the post-update "override page" directly, we include a link in

              // about:mullvad-browser.

              prefb.setBoolPref(

                "mullvadbrowser.post_update.shouldNotify",

                true

              );

              openAboutMullvadBrowser = true;

              overridePage = "about:mullvad-browser";

            }

            break;

          }

          case OVERRIDE_NEW_BUILD_ID: {
@@ -1075,6 +1089,16 @@ nsBrowserContentHandler.prototype = { 
      startPage = "";

    }



    // If the user's homepage is about:mullvad-browser, we do not want to open

    // it twice with the override.

    if (

      openAboutMullvadBrowser &&

      startPage === "about:mullvad-browser" &&

      overridePage?.split("|").includes("about:mullvad-browser")

    ) {

      startPage = "";

    }



    // Only show the startPage if we're not restoring an update session and are

    // not set to skip the start page on this profile

    if (overridePage && startPage && !willRestoreSession && !skipStartPage) {