Commit 6fb53a7e authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by Richard Pospesel
Browse files

MB 112: Updater customization for Mullvad Browser 

MB 71: Set the updater base URL to Mullvad domain
parent 52c8cdf4

browser/app/profile/000-mullvad-browser.js

+12 −0
Original line number Diff line number Diff line
@@ -33,3 +33,15 @@ pref("browser.shell.checkDefaultBrowser", false); 


// mullvad-browser#228: default to spoof en-US and skip showing the dialog

pref("privacy.spoof_english", 2);



// privacy-browser#131: Review a few updater preferences

pref("app.update.notifyDuringDownload", true);

pref("app.update.url.manual", "https://mullvad.net/download/browser");

pref("app.update.url.details", "https://mullvad.net/download/browser");

pref("app.update.badgeWaitTime", 0);

pref("app.releaseNotesURL", "https://github.com/mullvad/mullvad-browser/releases");

// disables the 'What's New?' link in the about dialog, otherwise we need to

// duplicate logic for generating the url to the github releases page

pref("app.releaseNotesURL.aboutDialog", "about:blank");

// point to our feedback url rather than Mozilla's

pref("app.feedback.baseURL", "https://mullvad.net/help/tag/browser/");

browser/components/BrowserContentHandler.sys.mjs

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ XPCOMUtils.defineLazyGetter(lazy, "gWindowsAlertsService", () => { 
});



const FORK_VERSION_PREF =

  "browser.startup.homepage_override.basebrowser.version";

  "browser.startup.homepage_override.mullvadbrowser.version";



// One-time startup homepage override configurations

const ONCE_DOMAINS = ["mozilla.org", "firefox.com"];

browser/confvars.sh

+6 −6
Original line number Diff line number Diff line
@@ -25,14 +25,14 @@ MOZ_APP_ID={ec8030f7-c20a-464f-9b0e-13a3a9e97384} 
# of values.

# The MAR_CHANNEL_ID must not contain the following 3 characters: ",\t "

if test "$MOZ_UPDATE_CHANNEL" = "alpha"; then

  ACCEPTED_MAR_CHANNEL_IDS=basebrowser-torproject-alpha

  MAR_CHANNEL_ID=basebrowser-torproject-alpha

  ACCEPTED_MAR_CHANNEL_IDS=mullvadbrowser-mullvad-alpha

  MAR_CHANNEL_ID=mullvadbrowser-mullvad-alpha

elif test "$MOZ_UPDATE_CHANNEL" = "nightly"; then

  ACCEPTED_MAR_CHANNEL_IDS=basebrowser-torproject-nightly

  MAR_CHANNEL_ID=basebrowser-torproject-nightly

  ACCEPTED_MAR_CHANNEL_IDS=mullvadbrowser-mullvad-nightly

  MAR_CHANNEL_ID=mullvadbrowser-mullvad-nightly

else

  ACCEPTED_MAR_CHANNEL_IDS=basebrowser-torproject-release

  MAR_CHANNEL_ID=basebrowser-torproject-release

  ACCEPTED_MAR_CHANNEL_IDS=mullvadbrowser-mullvad-release

  MAR_CHANNEL_ID=mullvadbrowser-mullvad-release

fi



# Include the DevTools client, not just the server (which is the default)

toolkit/mozapps/extensions/AddonManager.sys.mjs

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ const PREF_EM_STRICT_COMPATIBILITY = "extensions.strictCompatibility"; 
const PREF_EM_CHECK_UPDATE_SECURITY = "extensions.checkUpdateSecurity";

const PREF_SYS_ADDON_UPDATE_ENABLED = "extensions.systemAddon.update.enabled";

const PREF_REMOTESETTINGS_DISABLED = "extensions.remoteSettings.disabled";

const PREF_EM_LAST_FORK_VERSION = "extensions.lastBaseBrowserVersion";

const PREF_EM_LAST_FORK_VERSION = "extensions.lastMullvadBrowserVersion";



const PREF_MIN_WEBEXT_PLATFORM_VERSION =

  "extensions.webExtensionsMinPlatformVersion";

toolkit/xre/nsAppRunner.cpp

+2 −2
Original line number Diff line number Diff line
@@ -3434,7 +3434,7 @@ static bool CheckCompatibility(nsIFile* aProfileDir, const nsCString& aVersion, 
  nsAutoCString buf;



  nsAutoCString forkVersion(BASE_BROWSER_VERSION_QUOTED);

  rv = parser.GetString("Compatibility", "LastBaseBrowserVersion", buf);

  rv = parser.GetString("Compatibility", "LastMullvadBrowserVersion", buf);

  if (NS_FAILED(rv) || !forkVersion.Equals(buf)) return false;



  rv = parser.GetString("Compatibility", "LastOSABI", buf);
@@ -3524,7 +3524,7 @@ static void WriteVersion(nsIFile* aProfileDir, const nsCString& aVersion, 


  nsAutoCString forkVersion(BASE_BROWSER_VERSION_QUOTED);

  static const char kForkVersionHeader[] =

      NS_LINEBREAK "LastBaseBrowserVersion=";

      NS_LINEBREAK "LastMullvadBrowserVersion=";

  PR_Write(fd, kForkVersionHeader, sizeof(kForkVersionHeader) - 1);

  PR_Write(fd, forkVersion.get(), forkVersion.Length());