March 2024 - tbb-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] Bug 42438: Tweaks to the migration wizard.
by Pier Angelo Vendrame (＠pierov) 07 Mar '24

07 Mar '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 1b9657fb by Pier Angelo Vendrame at 2024-03-07T10:46:47+01:00 Bug 42438: Tweaks to the migration wizard. Remove the items not compatible with our features (such as history) from the migration wizard. On Linux, allow to specify an alternative home directory, since we usually change $HOME in our startup script. - - - - - 2 changed files: - browser/components/migration/ChromeMigrationUtils.sys.mjs - browser/components/migration/content/migration-wizard.mjs Changes: ===================================== browser/components/migration/ChromeMigrationUtils.sys.mjs ===================================== @@ -317,7 +317,10 @@ export var ChromeMigrationUtils = { for (let subfolders of options) { let rootDir = subfolders[0]; try { - let targetPath = Services.dirsvc.get(rootDir, Ci.nsIFile).path; + let targetPath = + rootDir === "Home" && Services.env.get("BB_ORIGINAL_HOME") + ? Services.env.get("BB_ORIGINAL_HOME") + : Services.dirsvc.get(rootDir, Ci.nsIFile).path; targetPath = PathUtils.join(targetPath, ...subfolders.slice(1)); if (await IOUtils.exists(targetPath)) { return targetPath; ===================================== browser/components/migration/content/migration-wizard.mjs ===================================== @@ -416,7 +416,10 @@ export class MigrationWizard extends HTMLElement { } let key = panelItem.getAttribute("key"); - let resourceTypes = panelItem.resourceTypes; + const allowedTypes = ["BOOKMARKS"]; + let resourceTypes = panelItem.resourceTypes.filter(t => + allowedTypes.includes(t) + ); for (let child of this.#resourceTypeList.querySelectorAll( "label[data-resource-type]" View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/1b9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/1b9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.5-1] Bug 42438: Tweaks to the migration wizard.
by Pier Angelo Vendrame (＠pierov) 07 Mar '24

07 Mar '24

Pier Angelo Vendrame pushed to branch base-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 12b60a12 by Pier Angelo Vendrame at 2024-03-07T10:46:11+01:00 Bug 42438: Tweaks to the migration wizard. Remove the items not compatible with our features (such as history) from the migration wizard. On Linux, allow to specify an alternative home directory, since we usually change $HOME in our startup script. - - - - - 2 changed files: - browser/components/migration/ChromeMigrationUtils.sys.mjs - browser/components/migration/content/migration-wizard.mjs Changes: ===================================== browser/components/migration/ChromeMigrationUtils.sys.mjs ===================================== @@ -317,7 +317,10 @@ export var ChromeMigrationUtils = { for (let subfolders of options) { let rootDir = subfolders[0]; try { - let targetPath = Services.dirsvc.get(rootDir, Ci.nsIFile).path; + let targetPath = + rootDir === "Home" && Services.env.get("BB_ORIGINAL_HOME") + ? Services.env.get("BB_ORIGINAL_HOME") + : Services.dirsvc.get(rootDir, Ci.nsIFile).path; targetPath = PathUtils.join(targetPath, ...subfolders.slice(1)); if (await IOUtils.exists(targetPath)) { return targetPath; ===================================== browser/components/migration/content/migration-wizard.mjs ===================================== @@ -416,7 +416,10 @@ export class MigrationWizard extends HTMLElement { } let key = panelItem.getAttribute("key"); - let resourceTypes = panelItem.resourceTypes; + const allowedTypes = ["BOOKMARKS"]; + let resourceTypes = panelItem.resourceTypes.filter(t => + allowedTypes.includes(t) + ); for (let child of this.#resourceTypeList.querySelectorAll( "label[data-resource-type]" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/12b60a1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/12b60a1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] Bug 42438: Tweaks to the migration wizard.
by Pier Angelo Vendrame (＠pierov) 07 Mar '24

07 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: a014a0e0 by Pier Angelo Vendrame at 2024-03-07T10:44:55+01:00 Bug 42438: Tweaks to the migration wizard. Remove the items not compatible with our features (such as history) from the migration wizard. On Linux, allow to specify an alternative home directory, since we usually change $HOME in our startup script. - - - - - 2 changed files: - browser/components/migration/ChromeMigrationUtils.sys.mjs - browser/components/migration/content/migration-wizard.mjs Changes: ===================================== browser/components/migration/ChromeMigrationUtils.sys.mjs ===================================== @@ -317,7 +317,10 @@ export var ChromeMigrationUtils = { for (let subfolders of options) { let rootDir = subfolders[0]; try { - let targetPath = Services.dirsvc.get(rootDir, Ci.nsIFile).path; + let targetPath = + rootDir === "Home" && Services.env.get("BB_ORIGINAL_HOME") + ? Services.env.get("BB_ORIGINAL_HOME") + : Services.dirsvc.get(rootDir, Ci.nsIFile).path; targetPath = PathUtils.join(targetPath, ...subfolders.slice(1)); if (await IOUtils.exists(targetPath)) { return targetPath; ===================================== browser/components/migration/content/migration-wizard.mjs ===================================== @@ -416,7 +416,10 @@ export class MigrationWizard extends HTMLElement { } let key = panelItem.getAttribute("key"); - let resourceTypes = panelItem.resourceTypes; + const allowedTypes = ["BOOKMARKS"]; + let resourceTypes = panelItem.resourceTypes.filter(t => + allowedTypes.includes(t) + ); for (let child of this.#resourceTypeList.querySelectorAll( "label[data-resource-type]" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a014a0e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a014a0e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 42438 (TB): Export the original $HOME on Linux.
by Pier Angelo Vendrame (＠pierov) 07 Mar '24

07 Mar '24

Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 14d5ad27 by Pier Angelo Vendrame at 2024-03-06T18:47:08+00:00 Bug 42438 (TB): Export the original $HOME on Linux. We need it for the migration wizard (e.g., to import bookmarks). - - - - - 1 changed file: - projects/browser/RelativeLink/start-browser Changes: ===================================== projects/browser/RelativeLink/start-browser ===================================== @@ -254,6 +254,7 @@ if [ "$register_desktop_app" -eq -1 ]; then exit 0 fi +export BB_ORIGINAL_HOME="$HOME" HOME="${PWD}" export HOME View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] fixup! Bug 41918: Option to reuse last window size when letterboxing is enabled.
by ma1 (＠ma1) 06 Mar '24

06 Mar '24

ma1 pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 6da931f7 by hackademix at 2024-03-06T22:12:22+01:00 fixup! Bug 41918: Option to reuse last window size when letterboxing is enabled. Fixes typo in RFHelper.sys.mjs (Service -> Services). - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -223,7 +223,7 @@ class _RFPHelper { _handlePrefChanged(data) { switch (data) { case kPrefResistFingerprinting: - Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); + Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize); this._handleResistFingerprintingChanged(); break; case kPrefSpoofEnglish: @@ -231,7 +231,7 @@ class _RFPHelper { this._handleSpoofEnglishChanged(); break; case kPrefLetterboxing: - Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); + Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize); case kPrefLetterboxingVcenter: case kPrefLetterboxingGradient: this._handleLetterboxingPrefChanged(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/6da… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/6da… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.8.0esr-13.5-1] fixup! Bug 41918: Option to reuse last window size when letterboxing is enabled.
by ma1 (＠ma1) 06 Mar '24

06 Mar '24

ma1 pushed to branch base-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 1564281f by hackademix at 2024-03-06T22:10:59+01:00 fixup! Bug 41918: Option to reuse last window size when letterboxing is enabled. Fixes typo in RFHelper.sys.mjs (Service -> Services). - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -223,7 +223,7 @@ class _RFPHelper { _handlePrefChanged(data) { switch (data) { case kPrefResistFingerprinting: - Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); + Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize); this._handleResistFingerprintingChanged(); break; case kPrefSpoofEnglish: @@ -231,7 +231,7 @@ class _RFPHelper { this._handleSpoofEnglishChanged(); break; case kPrefLetterboxing: - Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); + Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize); case kPrefLetterboxingVcenter: case kPrefLetterboxingGradient: this._handleLetterboxingPrefChanged(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1564281… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1564281… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] fixup! Bug 41918: Option to reuse last window size when letterboxing is enabled.
by ma1 (＠ma1) 06 Mar '24

06 Mar '24

ma1 pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 03dbfffc by hackademix at 2024-03-06T22:06:28+01:00 fixup! Bug 41918: Option to reuse last window size when letterboxing is enabled. Fixes typo in RFHelper.sys.mjs (Service -> Services). - - - - - 1 changed file: - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -223,7 +223,7 @@ class _RFPHelper { _handlePrefChanged(data) { switch (data) { case kPrefResistFingerprinting: - Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); + Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize); this._handleResistFingerprintingChanged(); break; case kPrefSpoofEnglish: @@ -231,7 +231,7 @@ class _RFPHelper { this._handleSpoofEnglishChanged(); break; case kPrefLetterboxing: - Service.prefs.clearUserPref(kPrefLetterboxingDidForceSize); + Services.prefs.clearUserPref(kPrefLetterboxingDidForceSize); case kPrefLetterboxingVcenter: case kPrefLetterboxingGradient: this._handleLetterboxingPrefChanged(); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/03dbfff… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/03dbfff… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] 3 commits: fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
by richard (＠richard) 06 Mar '24

06 Mar '24

richard pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: ba957be4 by Henry Wilkes at 2024-03-06T18:40:27+00:00 fixup! Bug 40562: Added Tor Browser preferences to 000-tor-browser.js Bug 42437: Drop "torbrowser.version" pref. - - - - - cba03e79 by Henry Wilkes at 2024-03-06T18:40:27+00:00 fixup! Bug 7494: Create local home page for TBB. Bug 42437: Drop "torbrowser.version" pref. - - - - - f44e1549 by Henry Wilkes at 2024-03-06T18:40:27+00:00 fixup! Bug 12620: TorBrowser regression tests Bug 42437: Drop "torbrowser.version" pref. - - - - - 3 changed files: - browser/app/profile/000-tor-browser.js - browser/components/abouttor/AboutTorMessage.sys.mjs - tbb-tests/browser_tor_TB4.js Changes: ===================================== browser/app/profile/000-tor-browser.js ===================================== @@ -46,8 +46,6 @@ pref("network.http.http3.enable", false); // 0 = do not use a second connection, see all.js and #7656 pref("network.http.connection-retry-timeout", 0); -#expand pref("torbrowser.version", __BASE_BROWSER_VERSION_QUOTED__); - // Tor Browser used to be compatible with non-Tor proxies. This feature is not // available anymore, but this legacy preference can be still used to disable // first-party domain circuit isolation. ===================================== browser/components/abouttor/AboutTorMessage.sys.mjs ===================================== @@ -27,7 +27,9 @@ export const AboutTorMessage = { if (Services.prefs.getBoolPref(shouldNotifyPref, false)) { Services.prefs.clearUserPref(shouldNotifyPref); return { - updateVersion: Services.prefs.getCharPref("torbrowser.version"), + 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"), ===================================== tbb-tests/browser_tor_TB4.js ===================================== @@ -11,9 +11,6 @@ let expectedPrefs = [ // Disable the "Refresh" prompt that is displayed for stale profiles. ["browser.disableResetPrompt", true], - - // Version placeholder - ["torbrowser.version", "dev-build"], ]; let getPref = function (prefName) { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/12e3f7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/12e3f7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.8.0esr-13.5-1] 2 commits: fixup! MB 39: Add home page about:mullvad-browser
by richard (＠richard) 06 Mar '24

06 Mar '24

richard pushed to branch mullvad-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 17a59ab8 by Henry Wilkes at 2024-03-06T18:38:37+00:00 fixup! MB 39: Add home page about:mullvad-browser Bug 271: Show update in about:mullvad-browser - - - - - f7da4302 by Henry Wilkes at 2024-03-06T18:38:37+00:00 fixup! MB 112: Updater customization for Mullvad Browser Bug 271: Do not open update override page in a new tab, and show in about:mullvad-browser instead. - - - - - 11 changed files: - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - + browser/components/mullvad-browser/AboutMullvadBrowserChild.sys.mjs - + browser/components/mullvad-browser/AboutMullvadBrowserParent.sys.mjs - + browser/components/mullvad-browser/content/2728-sparkles.svg - browser/components/mullvad-browser/content/aboutMullvadBrowser.css - + browser/components/mullvad-browser/content/aboutMullvadBrowser.js - browser/components/mullvad-browser/content/aboutMullvadBrowser.xhtml - browser/components/mullvad-browser/jar.mn - browser/components/mullvad-browser/moz.build - browser/locales/en-US/browser/mullvad-browser/aboutMullvadBrowser.ftl Changes: ===================================== browser/components/BrowserContentHandler.sys.mjs ===================================== @@ -666,6 +666,23 @@ nsBrowserContentHandler.prototype = { } } + // Retrieve the home page early so we can compare it against + // about:mullvad-browser to decide whether or not we need an override page + // (second tab) after an update was applied. + var startPage = ""; + try { + var choice = prefb.getIntPref("browser.startup.page"); + if (choice == 1 || choice == 3) { + startPage = lazy.HomePage.get(); + } + } catch (e) { + console.error(e); + } + + if (startPage == "about:blank") { + startPage = ""; + } + var override; var overridePage = ""; var additionalPage = ""; @@ -734,6 +751,17 @@ nsBrowserContentHandler.prototype = { "%OLD_BASE_BROWSER_VERSION%", old_forkVersion ); + if (overridePage && AppConstants.BASE_BROWSER_UPDATE) { + // Mullvad Browser, copied from tor-browser: Instead of opening + // the post-update "override page" directly, we include a link in + // about:mullvad-browser. + prefb.setCharPref("mullvadbrowser.post_update.url", overridePage); + prefb.setBoolPref("mullvadbrowser.post_update.shouldNotify", true); + // If the user's homepage is about:tor, we will inform them + // about the update on that page; otherwise, we arrange to + // open about:tor in a secondary tab. + overridePage = startPage === "about:mullvad-browser" ? "" : "about:mullvad-browser"; + } break; case OVERRIDE_NEW_BUILD_ID: if (lazy.UpdateManager.readyUpdate) { @@ -806,20 +834,6 @@ nsBrowserContentHandler.prototype = { } } - var startPage = ""; - try { - var choice = prefb.getIntPref("browser.startup.page"); - if (choice == 1 || choice == 3) { - startPage = lazy.HomePage.get(); - } - } catch (e) { - console.error(e); - } - - if (startPage == "about:blank") { - startPage = ""; - } - let skipStartPage = override == OVERRIDE_NEW_PROFILE && prefb.getBoolPref("browser.startup.firstrunSkipsHomepage"); ===================================== browser/components/BrowserGlue.sys.mjs ===================================== @@ -370,6 +370,20 @@ let JSWINDOWACTORS = { matches: ["about:messagepreview", "about:messagepreview?*"], }, + AboutMullvadBrowser: { + parent: { + esModuleURI: "resource:///actors/AboutMullvadBrowserParent.sys.mjs", + }, + child: { + esModuleURI: "resource:///actors/AboutMullvadBrowserChild.sys.mjs", + events: { + DOMContentLoaded: {}, + }, + }, + + matches: ["about:mullvad-browser"], + }, + AboutPlugins: { parent: { esModuleURI: "resource:///actors/AboutPluginsParent.sys.mjs", ===================================== browser/components/mullvad-browser/AboutMullvadBrowserChild.sys.mjs ===================================== @@ -0,0 +1,14 @@ +export class AboutMullvadBrowserChild extends JSWindowActorChild { + handleEvent(event) { + switch (event.type) { + case "DOMContentLoaded": + this.sendQuery("AboutMullvadBrowser:GetUpdateData").then(data => { + const updateEvent = new this.contentWindow.CustomEvent("UpdateData", { + detail: Cu.cloneInto(data, this.contentWindow), + }); + this.contentWindow.dispatchEvent(updateEvent); + }); + break; + } + } +} ===================================== browser/components/mullvad-browser/AboutMullvadBrowserParent.sys.mjs ===================================== @@ -0,0 +1,23 @@ +export class AboutMullvadBrowserParent extends JSWindowActorParent { + receiveMessage(message) { + const shouldNotifyPref = "mullvadbrowser.post_update.shouldNotify"; + switch (message.name) { + case "AboutMullvadBrowser:GetUpdateData": + if (!Services.prefs.getBoolPref(shouldNotifyPref, false)) { + return Promise.resolve(null); + } + Services.prefs.clearUserPref(shouldNotifyPref); + return Promise.resolve({ + version: Services.prefs.getCharPref( + "browser.startup.homepage_override.mullvadbrowser.version" + ), + url: + Services.prefs.getCharPref("mullvadbrowser.post_update.url", "") || + Services.urlFormatter.formatURLPref( + "startup.homepage_override_url" + ), + }); + } + return undefined; + } +} ===================================== browser/components/mullvad-browser/content/2728-sparkles.svg ===================================== @@ -0,0 +1,3 @@ + +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 36 36"><path fill="#FFAC33" d="M34.347 16.893l-8.899-3.294-3.323-10.891c-.128-.42-.517-.708-.956-.708-.439 0-.828.288-.956.708l-3.322 10.891-8.9 3.294c-.393.146-.653.519-.653.938 0 .418.26.793.653.938l8.895 3.293 3.324 11.223c.126.424.516.715.959.715.442 0 .833-.291.959-.716l3.324-11.223 8.896-3.293c.391-.144.652-.518.652-.937 0-.418-.261-.792-.653-.938z"/><path fill="#FFCC4D" d="M14.347 27.894l-2.314-.856-.9-3.3c-.118-.436-.513-.738-.964-.738-.451 0-.846.302-.965.737l-.9 3.3-2.313.856c-.393.145-.653.52-.653.938 0 .418.26.793.653.938l2.301.853.907 3.622c.112.444.511.756.97.756.459 0 .858-.312.97-.757l.907-3.622 2.301-.853c.393-.144.653-.519.653-.937 0-.418-.26-.793-.653-.937zM10.009 6.231l-2.364-.875-.876-2.365c-.145-.393-.519-.653-.938-.653-.418 0-.792.26-.938.653l-.875 2.365-2.365.875c-.393.146-.653.52-.653.938 0 .418.26.793.653.938l2.365.875.875 2.365c.146.393.52.653.938.653.418 0 .792-.26.938-.653l.875-2.365 2.365-.875c.393-.146.653-.52.653-.938 0-.418-.26-.792-.653-.938z"/></svg> ===================================== browser/components/mullvad-browser/content/aboutMullvadBrowser.css ===================================== @@ -44,14 +44,14 @@ p { #header { display: grid; - grid-template-rows: auto auto; - grid-template-columns: auto; + grid-template: "heading" auto "text" auto / auto; justify-items: center; align-content: center; gap: 1.5em; } #headingContainer { + grid-area: heading; display: inline flex; flex-direction: row; white-space: nowrap; @@ -59,6 +59,32 @@ p { gap: 16px; } +#mullvad-browser-update, +#mullvad-browser-intro { + grid-area: text; +} + +body:not(.has-update) #mullvad-browser-update { + display: none; +} + +body:not(.no-update) #mullvad-browser-intro { + /* Invisible but still reserves space for when the page is initially loaded to + * prevent the Mullvad title from jumping. */ + visibility: hidden; +} + +#mullvad-browser-update-img { + height: 1em; + vertical-align: sub; + margin-inline-end: 0.3em; +} + +#mullvad-browser-update a { + /* Increase gap between the link and the rest of the text. */ + margin-inline: 0.4em; +} + #footer { padding-block: 40px; background: rgba(0, 0, 0, 0.2); ===================================== browser/components/mullvad-browser/content/aboutMullvadBrowser.js ===================================== @@ -0,0 +1,20 @@ +"use strict"; + +window.addEventListener("UpdateData", event => { + const detail = event.detail; + if (detail) { + const { url, version } = detail; + + const text = document.getElementById("mullvad-browser-update"); + document.l10n.setAttributes( + text.querySelector("span"), + "about-mullvad-browser-update-message", + { version } + ); + text.querySelector("a").href = url; + } + // Before the first call, neither the intro nor update text are shown, this + // prevents the intro text from flashing in and out when we have an update. + document.body.classList.toggle("no-update", !detail); + document.body.classList.toggle("has-update", !!detail); +}); ===================================== browser/components/mullvad-browser/content/aboutMullvadBrowser.xhtml ===================================== @@ -21,6 +21,8 @@ rel="localization" href="browser/mullvad-browser/aboutMullvadBrowser.ftl" /> + + <script src="chrome://browser/content/mullvad-browser/aboutMullvadBrowser.js"></script> </head> <body> <div id="header"> @@ -48,11 +50,22 @@ data-l10n-id="about-mullvad-browser-heading" ></h1> </div> - <p data-l10n-id="about-mullvad-browser-developed-by"> + <p + id="mullvad-browser-intro" + data-l10n-id="about-mullvad-browser-developed-by" + > <a data-l10n-name="tor-project-link" href="https://www.torproject.org"> </a> <a data-l10n-name="mullvad-vpn-link" href="https://mullvad.net"> </a> </p> + <p id="mullvad-browser-update"> + <img + id="mullvad-browser-update-img" + alt="" + src="chrome://browser/content/mullvad-browser/2728-sparkles.svg" + /> + <span><a data-l10n-name="update-link"></a></span> + </p> </div> <div id="footer"> <p data-l10n-id="about-mullvad-browser-use-vpn"> ===================================== browser/components/mullvad-browser/jar.mn ===================================== @@ -1,4 +1,6 @@ browser.jar: + content/browser/mullvad-browser/aboutMullvadBrowser.js (content/aboutMullvadBrowser.js) content/browser/mullvad-browser/aboutMullvadBrowser.xhtml (content/aboutMullvadBrowser.xhtml) content/browser/mullvad-browser/aboutMullvadBrowser.css (content/aboutMullvadBrowser.css) content/browser/mullvad-browser/mullvadBrowserFont.css (content/mullvadBrowserFont.css) + content/browser/mullvad-browser/2728-sparkles.svg (content/2728-sparkles.svg) ===================================== browser/components/mullvad-browser/moz.build ===================================== @@ -1 +1,6 @@ JAR_MANIFESTS += ["jar.mn"] + +FINAL_TARGET_FILES.actors += [ + "AboutMullvadBrowserChild.sys.mjs", + "AboutMullvadBrowserParent.sys.mjs", +] ===================================== browser/locales/en-US/browser/mullvad-browser/aboutMullvadBrowser.ftl ===================================== @@ -3,6 +3,11 @@ about-mullvad-browser-developed-by = Developed in collaboration between the <a d about-mullvad-browser-use-vpn = Get more privacy by using the browser <a data-l10n-name="with-vpn-link">with Mullvad VPN</a>. about-mullvad-browser-learn-more = Curious to learn more about the browser? <a data-l10n-name="learn-more-link">Take a dive into the mole hole</a>. +# Update message. +# <a data-l10n-name="update-link"> should contain the link text and close with </a>. +# $version (String) - The new browser version. +about-mullvad-browser-update-message = { -brand-short-name } has been updated to { $version }. <a data-l10n-name="update-link">See what’s new</a> + ## Deprecated. To be removed when 13.5 becomes stable. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/68… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/68… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.8.0esr-13.5-1] 2 commits: fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 06 Mar '24

06 Mar '24

Pier Angelo Vendrame pushed to branch tor-browser-115.8.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: d4310b2a by Pier Angelo Vendrame at 2024-03-06T19:22:00+01:00 fixup! Firefox preference overrides. MB 80: Allow default browser on Windows for Mullvad Browser - - - - - 12e3f725 by Pier Angelo Vendrame at 2024-03-06T19:22:09+01:00 fixup! Bug 9173: Change the default Firefox profile directory to be relative. Force `GenerateAppUserModelID` to use the profile directory in portable mode. - - - - - 2 changed files: - browser/app/profile/001-base-profile.js - widget/windows/WinTaskbar.cpp Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -631,11 +631,6 @@ pref("privacy.query_stripping.strip_on_share.enabled", true); pref("dom.text-recognition.enabled", false); #ifdef XP_WIN -// prefs to disable jump-list entries in the taskbar on Windows (see bug #12885) -// this pref changes the app's set AUMID to be dependent on the profile path, rather than -// attempting to read it from the registry; this is necessary so that the file generated -// by the jumplist system can be properly deleted if it is disabled -pref("taskbar.grouping.useprofile", true); pref("browser.taskbar.lists.enabled", false); pref("browser.taskbar.lists.frequent.enabled", false); pref("browser.taskbar.lists.tasks.enabled", false); ===================================== widget/windows/WinTaskbar.cpp ===================================== @@ -209,6 +209,19 @@ bool WinTaskbar::GenerateAppUserModelID(nsAString& aAppUserModelId, // If marked as such in prefs, use a hash of the profile path for the id // instead of the install path hash setup by the installer. bool useProfile = Preferences::GetBool("taskbar.grouping.useprofile", false); + + { + // For portable mode, force the AUMID to be based on the profile directory + // instead of reading it from the registry. + bool isPortable = true; + // Do not even check if taskbar.grouping.useprofile is already true. + if (!useProfile && + NS_SUCCEEDED(gDirServiceProvider->GetIsPortableMode(&isPortable)) && + isPortable) { + useProfile = true; + } + } + if (useProfile) { nsCOMPtr<nsIFile> profileDir; NS_GetSpecialDirectory(NS_APP_USER_PROFILE_50_DIR, View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f4471d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f4471d… You're receiving this email because of your account on gitlab.torproject.org.

1 0