Verified Commit 1a2f12fb authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

fixup! Bug 4234: Use the Firefox Update Process for Base Browser.

Bug 41647: Clean up our {TOR,BASE}_BROWSER(_VERSION)? macros

Changed TOR_BROWSER_VERSION with BASE_BROWSER_VERSION.
parent 136387cd
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ async function init(aEvent) {

  // Adjust version text to show the Tor Browser version
  versionAttributes.version =
    AppConstants.TOR_BROWSER_VERSION +
    AppConstants.BASE_BROWSER_VERSION +
    " (based on Mozilla Firefox " +
    AppConstants.MOZ_APP_VERSION_DISPLAY +
    ")";
+3 −3
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ function needHomepageOverride(prefb) {

    prefb.setCharPref("browser.startup.homepage_override.mstone", mstone);
    prefb.setCharPref("browser.startup.homepage_override.buildID", buildID);
    prefb.setCharPref(kTBSavedVersionPref, AppConstants.TOR_BROWSER_VERSION);
    prefb.setCharPref(kTBSavedVersionPref, AppConstants.BASE_BROWSER_VERSION);

    // After an upgrade from an older release of Tor Browser (<= 5.5a1), the
    // savedmstone will be undefined because those releases included the
@@ -155,9 +155,9 @@ function needHomepageOverride(prefb) {
    return savedmstone || updated ? OVERRIDE_NEW_MSTONE : OVERRIDE_NEW_PROFILE;
  }

  if (AppConstants.TOR_BROWSER_VERSION != savedTBVersion) {
  if (AppConstants.BASE_BROWSER_VERSION != savedTBVersion) {
    prefb.setCharPref("browser.startup.homepage_override.buildID", buildID);
    prefb.setCharPref(kTBSavedVersionPref, AppConstants.TOR_BROWSER_VERSION);
    prefb.setCharPref(kTBSavedVersionPref, AppConstants.BASE_BROWSER_VERSION);
    return OVERRIDE_NEW_MSTONE;
  }

+1 −1
Original line number Diff line number Diff line
@@ -568,7 +568,7 @@ var gMainPane = {
        .setAttribute("style", "display: none !important");
    }
    // Initialize the Firefox Updates section.
    let version = AppConstants.TOR_BROWSER_VERSION;
    let version = AppConstants.BASE_BROWSER_VERSION;

    // Tor Browser: do not include the build ID in our alphas, since they are
    // not actually related to the build date.
+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ var UpdateUtils = {
          case "PRODUCT":
            return Services.appinfo.name;
          case "VERSION":
            return AppConstants.TOR_BROWSER_VERSION;
            return AppConstants.BASE_BROWSER_VERSION;
          case "BUILD_ID":
            return Services.appinfo.appBuildID;
          case "BUILD_TARGET":
+2 −2
Original line number Diff line number Diff line
@@ -652,7 +652,7 @@ var AddonManagerInternal = {
      let tbChanged = undefined;
      try {
        tbChanged =
          AppConstants.TOR_BROWSER_VERSION !==
          AppConstants.BASE_BROWSER_VERSION !==
          Services.prefs.getCharPref(PREF_EM_LAST_TORBROWSER_VERSION);
      } catch (e) {}
      if (tbChanged !== false) {
@@ -665,7 +665,7 @@ var AddonManagerInternal = {

        Services.prefs.setCharPref(
          PREF_EM_LAST_TORBROWSER_VERSION,
          AppConstants.TOR_BROWSER_VERSION
          AppConstants.BASE_BROWSER_VERSION
        );
      }

Loading