- tbb-commits - lists.torproject.org

[Git][tpo/applications/tor-browser][tor-browser-128.14.0esr-14.5-1] 4 commits: Bug 672618 - Don't execute javascript: URLs on CTRL+click, middle-click etc. r=dao
by ma1 (＠ma1) 18 Aug '25

18 Aug '25

ma1 pushed to branch tor-browser-128.14.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 7eff61f4 by Tom Schuster at 2025-08-17T23:15:21+02:00 Bug 672618 - Don't execute javascript: URLs on CTRL+click, middle-click etc. r=dao Differential Revision: https://phabricator.services.mozilla.com/D256648 BB 44100: cherry-picked except tests - - - - - 68a8c0b1 by Tom Schuster at 2025-08-17T23:44:16+02:00 Bug 1701974 - Use x-kde-passwordManagerHint when copying private data to the clipboard. r=stransky Differential Revision: https://phabricator.services.mozilla.com/D256781 - - - - - c97ea93d by Tom Schuster at 2025-08-18T10:06:51+02:00 Bug 1973900 - Remove support for the codebase attribute from <object>. r=farre,dom-core Differential Revision: https://phabricator.services.mozilla.com/D254958 - - - - - c5a292c1 by Kershaw Chang at 2025-08-18T10:30:17+02:00 Bug 1979955 - ensure transaction is alive (for ESR140), a=RyanVM Differential Revision: https://phabricator.services.mozilla.com/D260484 - - - - - 7 changed files: - browser/actors/ClickHandlerChild.sys.mjs - browser/app/profile/firefox.js - dom/base/nsObjectLoadingContent.cpp - modules/libpref/init/StaticPrefList.yaml - netwerk/protocol/http/nsHttpConnection.cpp - testing/web-platform/tests/html/semantics/embedded-content/the-object-element/historical.html - widget/gtk/nsClipboard.cpp Changes: ===================================== browser/actors/ClickHandlerChild.sys.mjs ===================================== @@ -12,12 +12,26 @@ ChromeUtils.defineESModuleGetters(lazy, { E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs", }); +XPCOMUtils.defineLazyPreferenceGetter( + lazy, + "autoscrollEnabled", + "general.autoScroll", + true +); + +XPCOMUtils.defineLazyPreferenceGetter( + lazy, + "blockJavascript", + "browser.link.alternative_click.block_javascript", + true +); + export class MiddleMousePasteHandlerChild extends JSWindowActorChild { handleEvent(clickEvent) { if ( clickEvent.defaultPrevented || clickEvent.button != 1 || - MiddleMousePasteHandlerChild.autoscrollEnabled + lazy.autoscrollEnabled ) { return; } @@ -34,13 +48,6 @@ export class MiddleMousePasteHandlerChild extends JSWindowActorChild { } } -XPCOMUtils.defineLazyPreferenceGetter( - MiddleMousePasteHandlerChild, - "autoscrollEnabled", - "general.autoScroll", - true -); - export class ClickHandlerChild extends JSWindowActorChild { handleEvent(wrapperEvent) { this.handleClickEvent(wrapperEvent.sourceEvent); @@ -112,6 +119,14 @@ export class ClickHandlerChild extends JSWindowActorChild { }; if (href && !isFromMiddleMousePasteHandler) { + if ( + lazy.blockJavascript && + Services.io.extractScheme(href) == "javascript" + ) { + // We don't want to open new tabs or windows for javascript: links. + return; + } + try { Services.scriptSecurityManager.checkLoadURIStrWithPrincipal( principal, ===================================== browser/app/profile/firefox.js ===================================== @@ -880,6 +880,9 @@ pref("browser.link.open_newwindow.restriction", 2); pref("browser.link.open_newwindow.disabled_in_fullscreen", false); #endif +// If true, opening javscript: URLs using middle-click, CTRL+click etc. are blocked. +pref("browser.link.alternative_click.block_javascript", true); + // Tabbed browser pref("browser.tabs.closeTabByDblclick", false); pref("browser.tabs.closeWindowWithLastTab", true); ===================================== dom/base/nsObjectLoadingContent.cpp ===================================== @@ -73,6 +73,7 @@ #include "mozilla/PresShell.h" #include "mozilla/ProfilerLabels.h" #include "mozilla/StaticPrefs_browser.h" +#include "mozilla/StaticPrefs_dom.h" #include "nsChannelClassifier.h" #include "nsFocusManager.h" #include "ReferrerInfo.h" @@ -720,11 +721,12 @@ nsObjectLoadingContent::UpdateObjectParameters() { /// Codebase /// - nsAutoString codebaseStr; nsIURI* docBaseURI = el->GetBaseURI(); - el->GetAttr(nsGkAtoms::codebase, codebaseStr); - if (!codebaseStr.IsEmpty()) { + nsAutoString codebaseStr; + el->GetAttr(nsGkAtoms::codebase, codebaseStr); + if (StaticPrefs::dom_object_embed_codebase_enabled() && + !codebaseStr.IsEmpty()) { rv = nsContentUtils::NewURIWithDocumentCharset( getter_AddRefs(newBaseURI), codebaseStr, el->OwnerDoc(), docBaseURI); if (NS_FAILED(rv)) { ===================================== modules/libpref/init/StaticPrefList.yaml ===================================== @@ -3214,6 +3214,12 @@ value: true mirror: always +# Whether the codebase attribute in an <object> is used as the base URI. +- name: dom.object_embed.codebase.enabled + type: bool + value: false + mirror: always + # Whether origin trials are enabled. - name: dom.origin-trials.enabled type: bool ===================================== netwerk/protocol/http/nsHttpConnection.cpp ===================================== @@ -1663,9 +1663,10 @@ nsresult nsHttpConnection::OnSocketWritable() { } LOG((" writing transaction request stream\n")); - rv = mTransaction->ReadSegmentsAgain(this, - nsIOService::gDefaultSegmentSize, - &transactionBytes, &again); + RefPtr<nsAHttpTransaction> transaction = mTransaction; + rv = transaction->ReadSegmentsAgain(this, + nsIOService::gDefaultSegmentSize, + &transactionBytes, &again); if (mTlsHandshaker->EarlyDataUsed()) { mContentBytesWritten0RTT += transactionBytes; if (NS_FAILED(rv) && rv != NS_BASE_STREAM_WOULD_BLOCK) { @@ -1688,7 +1689,8 @@ nsresult nsHttpConnection::OnSocketWritable() { static_cast<uint32_t>(mSocketOutCondition), again)); // XXX some streams return NS_BASE_STREAM_CLOSED to indicate EOF. - if (rv == NS_BASE_STREAM_CLOSED && !mTransaction->IsDone()) { + if (rv == NS_BASE_STREAM_CLOSED && + (mTransaction && !mTransaction->IsDone())) { rv = NS_OK; transactionBytes = 0; } @@ -1731,7 +1733,8 @@ nsresult nsHttpConnection::OnSocketWritable() { // When Spdy tunnel is used we need to explicitly set when a request is // done. if ((mState != HttpConnectionState::SETTING_UP_TUNNEL) && !mSpdySession) { - nsHttpTransaction* trans = mTransaction->QueryHttpTransaction(); + nsHttpTransaction* trans = + mTransaction ? mTransaction->QueryHttpTransaction() : nullptr; // needed for websocket over h2 (direct) if (!trans || !trans->IsWebsocketUpgrade()) { mRequestDone = true; @@ -1835,7 +1838,8 @@ nsresult nsHttpConnection::OnSocketReadable() { rv = NS_ERROR_FAILURE; LOG((" No Transaction In OnSocketWritable\n")); } else { - rv = mTransaction->WriteSegmentsAgain( + RefPtr<nsAHttpTransaction> transaction = mTransaction; + rv = transaction->WriteSegmentsAgain( this, nsIOService::gDefaultSegmentSize, &n, &again); } LOG(("nsHttpConnection::OnSocketReadable %p trans->ws rv=%" PRIx32 ===================================== testing/web-platform/tests/html/semantics/embedded-content/the-object-element/historical.html ===================================== @@ -30,4 +30,17 @@ async_test(t => { obj.onerror = t.unreached_func(); document.body.appendChild(obj); }, "object's typemustmatch content attribute should not be supported"); + +async_test(t => { + const obj = document.createElement("object"); + t.add_cleanup(() => obj.remove()); + obj.setAttribute("data", "/common/blank.html"); + obj.setAttribute("codebase", "https://test.invalid/"); + obj.onload = t.step_func_done(() => { + assert_not_equals(obj.contentDocument, null, "/common/blank.html should be loaded"); + assert_equals(obj.contentDocument.location.origin, location.origin, "document should be loaded with current origin as base"); + }); + obj.onerror = t.unreached_func(); + document.body.appendChild(obj); +}, "object's codebase content attribute should not be supported"); </script> ===================================== widget/gtk/nsClipboard.cpp ===================================== @@ -66,6 +66,10 @@ static const char kHTMLMarkupPrefix[] = static const char kURIListMime[] = "text/uri-list"; +// MIME to exclude sensitive data (password) from the clipboard history on not +// just KDE. +static const char kKDEPasswordManagerHintMime[] = "x-kde-passwordManagerHint"; + ClipboardTargets nsRetrievalContext::sClipboardTargets; ClipboardTargets nsRetrievalContext::sPrimaryTargets; @@ -323,6 +327,12 @@ nsClipboard::SetNativeClipboardData(nsITransferable* aTransferable, gtk_target_list_add(list, atom, 0, 0); } + // Try to exclude private data from clipboard history. + if (aTransferable->GetIsPrivateData()) { + GdkAtom atom = gdk_atom_intern(kKDEPasswordManagerHintMime, FALSE); + gtk_target_list_add(list, atom, 0, 0); + } + // Get GTK clipboard (CLIPBOARD or PRIMARY) GtkClipboard* gtkClipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard)); @@ -1313,6 +1323,22 @@ void nsClipboard::SelectionGetEvent(GtkClipboard* aClipboard, return; } + if (selectionTarget == gdk_atom_intern(kKDEPasswordManagerHintMime, FALSE)) { + if (!trans->GetIsPrivateData()) { + MOZ_CLIPBOARD_LOG( + " requested %s, but the data isn't actually private!\n", + kKDEPasswordManagerHintMime); + return; + } + + static const char* kSecret = "secret"; + MOZ_CLIPBOARD_LOG(" Setting data to '%s' for %s\n", kSecret, + kKDEPasswordManagerHintMime); + gtk_selection_data_set(aSelectionData, selectionTarget, 8, + (const guchar*)kSecret, strlen(kSecret)); + return; + } + MOZ_CLIPBOARD_LOG(" Try if we have anything at GetTransferData() for %s\n", GUniquePtr<gchar>(gdk_atom_name(selectionTarget)).get()); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/44c35e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/44c35e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 3 commits: Bug 672618 - Don't execute javascript: URLs on CTRL+click, middle-click etc. r=dao
by ma1 (＠ma1) 18 Aug '25

18 Aug '25

ma1 pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 1e27e250 by Tom Schuster at 2025-08-17T23:24:32+02:00 Bug 672618 - Don't execute javascript: URLs on CTRL+click, middle-click etc. r=dao Differential Revision: https://phabricator.services.mozilla.com/D256648 - - - - - 15852030 by Tom Schuster at 2025-08-17T23:33:51+02:00 Bug 1701974 - Use x-kde-passwordManagerHint when copying private data to the clipboard. r=stransky Differential Revision: https://phabricator.services.mozilla.com/D256781 - - - - - 1fcba6b6 by Tom Schuster at 2025-08-18T10:13:32+02:00 Bug 1973900 - Remove support for the codebase attribute from <object>. r=farre,dom-core Differential Revision: https://phabricator.services.mozilla.com/D254958 - - - - - 11 changed files: - browser/actors/ClickHandlerChild.sys.mjs - browser/app/profile/firefox.js - browser/base/content/test/general/browser_modifiedclick_inherit_principal.js - browser/base/content/test/linkHandling/browser.toml - browser/base/content/test/linkHandling/browser_contentAreaClick_subframe_javascript.js - + browser/base/content/test/linkHandling/browser_javascript_links.js - + browser/base/content/test/linkHandling/file_javascript_links_subframe.html - dom/base/nsObjectLoadingContent.cpp - modules/libpref/init/StaticPrefList.yaml - testing/web-platform/tests/html/semantics/embedded-content/the-object-element/historical.html - widget/gtk/nsClipboard.cpp Changes: ===================================== browser/actors/ClickHandlerChild.sys.mjs ===================================== @@ -12,12 +12,26 @@ ChromeUtils.defineESModuleGetters(lazy, { E10SUtils: "resource://gre/modules/E10SUtils.sys.mjs", }); +XPCOMUtils.defineLazyPreferenceGetter( + lazy, + "autoscrollEnabled", + "general.autoScroll", + true +); + +XPCOMUtils.defineLazyPreferenceGetter( + lazy, + "blockJavascript", + "browser.link.alternative_click.block_javascript", + true +); + export class MiddleMousePasteHandlerChild extends JSWindowActorChild { handleEvent(clickEvent) { if ( clickEvent.defaultPrevented || clickEvent.button != 1 || - MiddleMousePasteHandlerChild.autoscrollEnabled + lazy.autoscrollEnabled ) { return; } @@ -34,13 +48,6 @@ export class MiddleMousePasteHandlerChild extends JSWindowActorChild { } } -XPCOMUtils.defineLazyPreferenceGetter( - MiddleMousePasteHandlerChild, - "autoscrollEnabled", - "general.autoScroll", - true -); - export class ClickHandlerChild extends JSWindowActorChild { handleEvent(wrapperEvent) { this.handleClickEvent(wrapperEvent.sourceEvent); @@ -112,6 +119,14 @@ export class ClickHandlerChild extends JSWindowActorChild { }; if (href && !isFromMiddleMousePasteHandler) { + if ( + lazy.blockJavascript && + Services.io.extractScheme(href) == "javascript" + ) { + // We don't want to open new tabs or windows for javascript: links. + return; + } + try { Services.scriptSecurityManager.checkLoadURIStrWithPrincipal( principal, ===================================== browser/app/profile/firefox.js ===================================== @@ -907,6 +907,9 @@ pref("browser.link.open_newwindow.restriction", 2); pref("browser.link.open_newwindow.disabled_in_fullscreen", false); #endif +// If true, opening javscript: URLs using middle-click, CTRL+click etc. are blocked. +pref("browser.link.alternative_click.block_javascript", true); + // Tabbed browser pref("browser.tabs.closeTabByDblclick", false); pref("browser.tabs.closeWindowWithLastTab", true); ===================================== browser/base/content/test/general/browser_modifiedclick_inherit_principal.js ===================================== @@ -10,6 +10,10 @@ const kURL = * we use the correct principal, and we don't clear the URL bar. */ add_task(async function () { + await SpecialPowers.pushPrefEnv({ + set: [["browser.link.alternative_click.block_javascript", false]], + }); + await BrowserTestUtils.withNewTab(kURL, async function (browser) { let newTabPromise = BrowserTestUtils.waitForNewTab(gBrowser); await SpecialPowers.spawn(browser, [], async function () { ===================================== browser/base/content/test/linkHandling/browser.toml ===================================== @@ -2,3 +2,8 @@ support-files = [ "file_contentAreaClick_subframe_javascript.html" ] + +["browser_javascript_links.js"] +support-files = [ + "file_javascript_links_subframe.html" +] ===================================== browser/base/content/test/linkHandling/browser_contentAreaClick_subframe_javascript.js ===================================== @@ -5,6 +5,10 @@ const gExampleComRoot = getRootDirectory(gTestPath).replace( const IFRAME_FILE = "file_contentAreaClick_subframe_javascript.html"; add_task(async function () { + await SpecialPowers.pushPrefEnv({ + set: [["browser.link.alternative_click.block_javascript", false]], + }); + await BrowserTestUtils.withNewTab( `data:text/html,<iframe src="${gExampleComRoot + IFRAME_FILE}"></iframe>`, async browser => { ===================================== browser/base/content/test/linkHandling/browser_javascript_links.js ===================================== @@ -0,0 +1,88 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +"use strict"; + +const TEST_PATH = getRootDirectory(gTestPath).replace( + "chrome://mochitests/content/", + "https://example.com/" +); +const IFRAME_PATH = TEST_PATH + "file_javascript_links_subframe.html"; + +add_setup(async function () { + await SpecialPowers.pushPrefEnv({ + set: [ + ["browser.link.alternative_click.block_javascript", true], + ["browser.tabs.opentabfor.middleclick", true], + ["middlemouse.paste", false], + ["middlemouse.contentLoadURL", false], + ["general.autoScroll", false], + ], + }); +}); + +add_task(async function () { + await BrowserTestUtils.withNewTab( + `data:text/html,<a href="javascript:alert(1);">click me`, + async browser => { + await BrowserTestUtils.synthesizeMouseAtCenter( + "a", + { button: 0, ctrlKey: true, metaKey: true }, + browser + ); + is( + gBrowser.tabs.length, + 2, + "Accel+click on javascript: link shouldn't open a new tab" + ); + + await BrowserTestUtils.synthesizeMouseAtCenter( + "a", + { button: 1 }, + browser + ); + is( + gBrowser.tabs.length, + 2, + "Middle click on javascript: link shouldn't open a new tab" + ); + + await BrowserTestUtils.synthesizeMouseAtCenter( + "a", + { button: 0, shiftKey: true }, + browser + ); + // This is fragile and might miss the new window, but the test will fail + // anyway when finishing with an extra window left behind. + // eslint-disable-next-line mozilla/no-arbitrary-setTimeout + await new Promise(resolve => setTimeout(resolve, 200)); + is( + BrowserWindowTracker.windowCount, + 1, + "Shift+click on javascript: link shouldn't open a new window" + ); + } + ); +}); + +add_task(async function iframe_link() { + await BrowserTestUtils.withNewTab( + `data:text/html,<iframe src="${IFRAME_PATH}"></iframe>`, + async browser => { + // ctrl/cmd-click the link in the subframe. + await BrowserTestUtils.synthesizeMouseAtCenter( + "a", + { ctrlKey: true, metaKey: true }, + browser.browsingContext.children[0] + ); + + // eslint-disable-next-line mozilla/no-arbitrary-setTimeout + await new Promise(resolve => setTimeout(resolve, 200)); + is( + gBrowser.tabs.length, + 2, + "Click on javascript: link in iframe shouldn't open a new tab" + ); + } + ); +}); ===================================== browser/base/content/test/linkHandling/file_javascript_links_subframe.html ===================================== @@ -0,0 +1,2 @@ +<!DOCTYPE html> +<a href="javascript:alert(1)">click me ===================================== dom/base/nsObjectLoadingContent.cpp ===================================== @@ -73,6 +73,7 @@ #include "mozilla/PresShell.h" #include "mozilla/ProfilerLabels.h" #include "mozilla/StaticPrefs_browser.h" +#include "mozilla/StaticPrefs_dom.h" #include "nsChannelClassifier.h" #include "nsFocusManager.h" #include "ReferrerInfo.h" @@ -736,11 +737,12 @@ nsObjectLoadingContent::UpdateObjectParameters() { /// Codebase /// - nsAutoString codebaseStr; nsIURI* docBaseURI = el->GetBaseURI(); - el->GetAttr(nsGkAtoms::codebase, codebaseStr); - if (!codebaseStr.IsEmpty()) { + nsAutoString codebaseStr; + el->GetAttr(nsGkAtoms::codebase, codebaseStr); + if (StaticPrefs::dom_object_embed_codebase_enabled() && + !codebaseStr.IsEmpty()) { rv = nsContentUtils::NewURIWithDocumentCharset( getter_AddRefs(newBaseURI), codebaseStr, el->OwnerDoc(), docBaseURI); if (NS_FAILED(rv)) { ===================================== modules/libpref/init/StaticPrefList.yaml ===================================== @@ -3641,6 +3641,12 @@ value: true mirror: always +# Whether the codebase attribute in an <object> is used as the base URI. +- name: dom.object_embed.codebase.enabled + type: bool + value: false + mirror: always + # Whether origin trials are enabled. - name: dom.origin-trials.enabled type: bool ===================================== testing/web-platform/tests/html/semantics/embedded-content/the-object-element/historical.html ===================================== @@ -30,4 +30,17 @@ async_test(t => { obj.onerror = t.unreached_func(); document.body.appendChild(obj); }, "object's typemustmatch content attribute should not be supported"); + +async_test(t => { + const obj = document.createElement("object"); + t.add_cleanup(() => obj.remove()); + obj.setAttribute("data", "/common/blank.html"); + obj.setAttribute("codebase", "https://test.invalid/"); + obj.onload = t.step_func_done(() => { + assert_not_equals(obj.contentDocument, null, "/common/blank.html should be loaded"); + assert_equals(obj.contentDocument.location.origin, location.origin, "document should be loaded with current origin as base"); + }); + obj.onerror = t.unreached_func(); + document.body.appendChild(obj); +}, "object's codebase content attribute should not be supported"); </script> ===================================== widget/gtk/nsClipboard.cpp ===================================== @@ -66,6 +66,10 @@ static const char kHTMLMarkupPrefix[] = static const char kURIListMime[] = "text/uri-list"; +// MIME to exclude sensitive data (password) from the clipboard history on not +// just KDE. +static const char kKDEPasswordManagerHintMime[] = "x-kde-passwordManagerHint"; + MOZ_CONSTINIT ClipboardTargets nsRetrievalContext::sClipboardTargets; MOZ_CONSTINIT ClipboardTargets nsRetrievalContext::sPrimaryTargets; @@ -313,6 +317,12 @@ nsClipboard::SetNativeClipboardData(nsITransferable* aTransferable, gtk_target_list_add(list, atom, 0, 0); } + // Try to exclude private data from clipboard history. + if (aTransferable->GetIsPrivateData()) { + GdkAtom atom = gdk_atom_intern(kKDEPasswordManagerHintMime, FALSE); + gtk_target_list_add(list, atom, 0, 0); + } + // Get GTK clipboard (CLIPBOARD or PRIMARY) GtkClipboard* gtkClipboard = gtk_clipboard_get(GetSelectionAtom(aWhichClipboard)); @@ -1228,6 +1238,22 @@ void nsClipboard::SelectionGetEvent(GtkClipboard* aClipboard, return; } + if (selectionTarget == gdk_atom_intern(kKDEPasswordManagerHintMime, FALSE)) { + if (!trans->GetIsPrivateData()) { + MOZ_CLIPBOARD_LOG( + " requested %s, but the data isn't actually private!\n", + kKDEPasswordManagerHintMime); + return; + } + + static const char* kSecret = "secret"; + MOZ_CLIPBOARD_LOG(" Setting data to '%s' for %s\n", kSecret, + kKDEPasswordManagerHintMime); + gtk_selection_data_set(aSelectionData, selectionTarget, 8, + (const guchar*)kSecret, strlen(kSecret)); + return; + } + MOZ_CLIPBOARD_LOG(" Try if we have anything at GetTransferData() for %s\n", GUniquePtr<gchar>(gdk_atom_name(selectionTarget)).get()); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4169e5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/4169e5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.27.0esr-13.5-1
by brizental (＠brizental) 18 Aug '25

18 Aug '25

brizental pushed new branch tor-browser-115.27.0esr-13.5-1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_115_27_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 18 Aug '25

18 Aug '25

Pier Angelo Vendrame pushed new tag FIREFOX_115_27_0esr_BUILD1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] fixup! TB 42308: Create README for tor-browser.
by morgan (＠morgan) 14 Aug '25

14 Aug '25

morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 4169e51a by Morgan at 2025-08-14T16:49:09+00:00 fixup! TB 42308: Create README for tor-browser. Links in the README pointed to a 404 page with no indication of the new location of these pages. Update both links. Fixes: tpo/applications/tor-browser#44061 - - - - - 1 changed file: - README.md Changes: ===================================== README.md ===================================== @@ -2,5 +2,5 @@ The tor-browser repository is based on Mozilla Firefox. See the following wiki links for more information: -+ [Repository Overview](https://gitlab.torproject.org/tpo/applications/team/-/wikis/Devel… -+ [Contributing](https://gitlab.torproject.org/tpo/applications/team/-/wikis/D… ++ [Repository Overview](https://gitlab.torproject.org/tpo/applications/wiki/-/wikis/Devel… ++ [Contributing](https://gitlab.torproject.org/tpo/applications/wiki/-/wikis/D… View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4169e51… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4169e51… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41537: Add tools/count-mar-downloads
by morgan (＠morgan) 14 Aug '25

14 Aug '25

morgan pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 4178ea77 by Nicolas Vigier at 2025-08-14T16:41:33+00:00 Bug 41537: Add tools/count-mar-downloads Add a script to count how many mar files for each version have been downloaded from cdn.torproject.org. - - - - - 1 changed file: - + tools/count-mar-downloads Changes: ===================================== tools/count-mar-downloads ===================================== @@ -0,0 +1,122 @@ +#!/usr/bin/perl -w +# +# This script takes logs archive months as arguments. +# Example: count-mar-downloads 2025-08 2025-07 +# Check which months are available on https://collector.torproject.org/archive/webstats/ +# +# The script will dowload the log archives for the selected months, +# extract them, parse the logs and print download numbers per version +# numbers, OS, and incremental/full updates. +# +# The log files archives are stored in the tools/web-logs-count-mar-downloads +# directory. +# +use strict; +use FindBin; +use lib "$FindBin::Bin/../rbm/lib"; +use RBM::CaptureExec qw(capture_exec); +use File::Temp qw/tempdir/; +use File::Copy qw/move/; +use File::Find; + +if (!@ARGV) { + print "Usage: count-mar-downloads <month>\n"; + print "Example: count-mar-downloads 2025-08 2025-07\n"; + print "Check which months are available on https://collector.torproject.org/archive/webstats/\n"; + exit 1; +} + +my @months = @ARGV; + +my %downloads; + +my $weblogsdir = "$FindBin::Bin/web-logs-count-mar-downloads"; +mkdir $weblogsdir; +chdir $weblogsdir; + +sub exit_error { + print STDERR "Error: ", $_[0], "\n"; + exit (exists $_[1] ? $_[1] : 1); +} + +sub download_log_files { + my $tmpdir = tempdir(CLEANUP => 1); + foreach my $month (@months) { + my $file = "webstats-$month.tar"; + if (-f $file) { + print STDERR "Using existing file $file (remove it if you want to re-download it).\n"; + next; + } + my $url = "https://collector.torproject.org/archive/webstats/$file"; + exit_error "Error downloading $url" unless + system('wget', '-O', "$tmpdir/$file", $url) == 0; + move("$tmpdir/$file", "$weblogsdir/$file"); + } +} + +sub parse_log_file { + return unless -f $File::Find::name; + return unless $File::Find::name =~ m/\.xz$/; + + print STDERR "Reading $_\n"; + + my ($stdout, undef, $success) = capture_exec('xzcat', $File::Find::name); + foreach my $line (split /\n/, $stdout) { + my ($version, $os) = + ($line =~ m|^[^\s]+ - - \[.+\] "GET /aus1/torbrowser/([^/]+)/tor-browser-(.*)-\d.*_ALL\.mar HTTP/|); + if ($version) { + $downloads{$version}{total} += 1; + $downloads{$version}{full_update} += 1; + $downloads{$version}{OS}{$os} += 1; + next; + } + my $incremental_from; + ($version, $os, $incremental_from) = + ($line =~ m|^[^\s]+ - - \[.+\] "GET /aus1/torbrowser/([^/]+)/tor-browser-(.*)--(\d[^-]+)-.*_ALL\.incremental\.mar HTTP/|); + if ($incremental_from) { + $downloads{$version}{total} += 1; + $downloads{$version}{OS}{$os} += 1; + $downloads{$version}{incremental_update_total} += 1; + $downloads{$version}{incremental_update}{$incremental_from} += 1; + } + } +} + +sub parse_log_files { + my $tmpdir = tempdir(CLEANUP => 1); + foreach my $month (@months) { + my $file = "webstats-$month.tar"; + print STDERR "Extracting $file\n"; + my (undef, undef, $success) = capture_exec('tar', '-C', $tmpdir, '-xf', + $file, "webstats-$month/cdn.torproject.org"); + + find(\&parse_log_file, "$tmpdir/webstats-$month/cdn.torproject.org"); + } +} + +sub print_results { + print 'Download numbers for months ', join(' ', @months), ":\n\n"; + my @versions = sort { $downloads{$b}{total} <=> $downloads{$a}{total} } + keys %downloads; + foreach my $version (@versions) { + print "Version: $version\n"; + print " Total: $downloads{$version}{total}\n"; + print " Per OS:\n"; + foreach my $os (sort keys %{$downloads{$version}{OS}}) { + print " $os: $downloads{$version}{OS}{$os}\n"; + } + print " Full updates: $downloads{$version}{full_update}\n" + if $downloads{$version}{full_update}; + if ($downloads{$version}{incremental_update_total}) { + print " Incremental updates (total): $downloads{$version}{incremental_update_total}\n"; + foreach my $incremental_from (sort keys %{$downloads{$version}{incremental_update}}) { + print " Incremental updates from $incremental_from: $downloads{$version}{incremental_update}{$incremental_from}\n"; + } + } + print "\n"; + } +} + +download_log_files; +parse_log_files; +print_results; View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.2.0esr-15.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 14 Aug '25

14 Aug '25

morgan pushed to branch mullvad-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: ed7f168e by Pier Angelo Vendrame at 2025-08-14T16:32:44+00:00 fixup! Firefox preference overrides. BB 41131: Make sure background tasks are not used for shutdown cleanup. privacy.sanitize.sanitizeOnShutdown (disabled by default) might try to use background tasks, without checking whether they are actually available (they are not for us, as we disable them at build time). - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -72,6 +72,12 @@ pref("browser.helperApps.deleteTempFileOnExit", true); // Prevent download stuffing / DOS (tor-browser#41764) pref("browser.download.enable_spam_prevention", true); +// tor-browser#41131: This is normally gated on +// privacy.sanitize.sanitizeOnShutdown, which is false by default. But in case +// users enable it, make sure background tasks are not used for this, since we +// disable them as well (but at compile time). +pref("network.cache.shutdown_purge_in_background_task", false); + // Misc privacy: Disk pref("signon.rememberSignons", false, locked); pref("browser.formfill.enable", false, locked); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/ed7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/ed7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.2.0esr-15.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 14 Aug '25

14 Aug '25

morgan pushed to branch base-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 4a69d655 by Pier Angelo Vendrame at 2025-08-14T16:31:40+00:00 fixup! Firefox preference overrides. BB 41131: Make sure background tasks are not used for shutdown cleanup. privacy.sanitize.sanitizeOnShutdown (disabled by default) might try to use background tasks, without checking whether they are actually available (they are not for us, as we disable them at build time). - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -72,6 +72,12 @@ pref("browser.helperApps.deleteTempFileOnExit", true); // Prevent download stuffing / DOS (tor-browser#41764) pref("browser.download.enable_spam_prevention", true); +// tor-browser#41131: This is normally gated on +// privacy.sanitize.sanitizeOnShutdown, which is false by default. But in case +// users enable it, make sure background tasks are not used for this, since we +// disable them as well (but at compile time). +pref("network.cache.shutdown_purge_in_background_task", false); + // Misc privacy: Disk pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4a69d65… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/4a69d65… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] fixup! Firefox preference overrides.
by morgan (＠morgan) 14 Aug '25

14 Aug '25

morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 68840371 by Pier Angelo Vendrame at 2025-08-14T16:22:54+00:00 fixup! Firefox preference overrides. BB 41131: Make sure background tasks are not used for shutdown cleanup. privacy.sanitize.sanitizeOnShutdown (disabled by default) might try to use background tasks, without checking whether they are actually available (they are not for us, as we disable them at build time). - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -72,6 +72,12 @@ pref("browser.helperApps.deleteTempFileOnExit", true); // Prevent download stuffing / DOS (tor-browser#41764) pref("browser.download.enable_spam_prevention", true); +// tor-browser#41131: This is normally gated on +// privacy.sanitize.sanitizeOnShutdown, which is false by default. But in case +// users enable it, make sure background tasks are not used for this, since we +// disable them as well (but at compile time). +pref("network.cache.shutdown_purge_in_background_task", false); + // Misc privacy: Disk pref("signon.rememberSignons", false); pref("browser.formfill.enable", false); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6884037… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/6884037… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.2.0esr-15.0-1] 2 commits: fixup! [android] Rename as Tor Browser
by morgan (＠morgan) 14 Aug '25

14 Aug '25

morgan pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 947a8538 by clairehurst at 2025-08-14T16:20:30+00:00 fixup! [android] Rename as Tor Browser tor-browser#43179 Make persistent 'private tabs' notification distinct from Firefox's - - - - - c8457722 by clairehurst at 2025-08-14T16:20:30+00:00 fixup! [android] TBA strings tor-browser#43179 Make persistent 'private tabs' notification distinct from Firefox's - - - - - 26 changed files: - + mobile/android/fenix/app/src/beta/res/drawable-anydpi-v24/ic_tor_browser_close_tabs_notification.xml - + mobile/android/fenix/app/src/beta/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png - + mobile/android/fenix/app/src/beta/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png - + mobile/android/fenix/app/src/beta/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png - + mobile/android/fenix/app/src/beta/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png - mobile/android/fenix/app/src/beta/res/values/colors.xml - + mobile/android/fenix/app/src/debug/res/drawable-anydpi-v24/ic_tor_browser_close_tabs_notification.xml - + mobile/android/fenix/app/src/debug/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png - + mobile/android/fenix/app/src/debug/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png - + mobile/android/fenix/app/src/debug/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png - + mobile/android/fenix/app/src/debug/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png - mobile/android/fenix/app/src/debug/res/values/colors.xml - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/session/PrivateNotificationService.kt - mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml - + mobile/android/fenix/app/src/nightly/res/drawable-anydpi-v24/ic_tor_browser_close_tabs_notification.xml - + mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png - + mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png - + mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png - + mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png - mobile/android/fenix/app/src/nightly/res/values/colors.xml - + mobile/android/fenix/app/src/release/res/drawable-anydpi-v24/ic_tor_browser_close_tabs_notification.xml - + mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png - + mobile/android/fenix/app/src/release/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png - + mobile/android/fenix/app/src/release/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png - + mobile/android/fenix/app/src/release/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png - mobile/android/fenix/app/src/release/res/values/colors.xml Changes: ===================================== mobile/android/fenix/app/src/beta/res/drawable-anydpi-v24/ic_tor_browser_close_tabs_notification.xml ===================================== @@ -0,0 +1,24 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="256" + android:viewportHeight="257" + android:tint="#FFFFFF"> + <group android:scaleX="1.84" + android:scaleY="1.84" + android:translateX="-107.52" + android:translateY="-107.94"> + <group android:scaleX="0.4869866" + android:scaleY="0.4888889" + android:translateX="65.66572" + android:translateY="65.67778"> + <path + android:pathData="M62.56,111.94C67,111.94 70.72,110.38 73.92,107.17C77.13,103.96 78.68,99.93 78.68,94.86C78.68,90.5 77.04,86.73 73.65,83.34L73.63,83.32C70.34,79.95 66.63,78.31 62.29,78.31C58.59,78.31 55.28,79.9 52.17,83.17C49.12,86.38 47.63,90.16 47.63,94.72C47.63,97.37 47.99,99.8 48.7,101.94C49.48,104.04 50.53,105.88 51.84,107.43C53.11,108.84 54.66,109.98 56.45,110.81C58.27,111.56 60.33,111.94 62.56,111.94Z" + android:fillColor="#4A454E"/> + <path + android:pathData="M128,256.91C198.69,256.91 256,199.6 256,128.91C256,58.22 198.69,0.91 128,0.91C57.31,0.91 0,58.22 0,128.91C0,199.6 57.31,256.91 128,256.91ZM233,128.91C233,70.92 185.99,23.91 128,23.91V39.91C177.15,39.91 217,79.75 217,128.91C217,178.06 177.15,217.91 128,217.91V233.91C185.99,233.91 233,186.9 233,128.91ZM193.75,128.91C193.75,92.6 164.31,63.16 128,63.16V79.16C155.48,79.16 177.75,101.43 177.75,128.91C177.75,156.38 155.48,178.66 128,178.66V194.66C164.31,194.66 193.75,165.22 193.75,128.91ZM128,101.66C143.05,101.66 155.25,113.86 155.25,128.91C155.25,143.96 143.05,156.16 128,156.16V101.66ZM90.71,94.86C90.71,102.56 93.36,108.02 98.8,111.54C100.29,112.5 101.06,114.24 100.75,115.96L99.93,120.5C99.68,121.87 98.79,123.03 97.53,123.61C96.29,124.18 94.9,124.11 93.71,123.42C89.35,120.88 86.16,117.89 84.18,114.5C82.28,116.93 79.87,119.01 76.97,120.71L76.97,120.72L76.75,120.84C72.29,123.36 67.51,124.64 62.56,124.64C53.76,124.64 46.62,121.63 41.34,115.68L41.3,115.63C36.54,110.19 34.13,103.15 34.13,94.72C34.13,87.5 36.44,81.01 40.98,75.43L41.23,75.12L41.48,74.83C46.84,68.62 53.54,65.47 62.56,65.47C71.58,65.47 78.82,68.88 84.13,75.62C86.04,71.65 89.25,68.27 93.74,65.52C94.97,64.77 96.45,64.71 97.73,65.34C99.04,66 99.91,67.26 100.05,68.73L100.51,73.51C100.64,74.82 100.16,76.11 99.2,77.03C93.49,82.51 90.71,88.34 90.71,94.86Z" + android:fillColor="#4A454E" + android:fillType="evenOdd"/> + </group> + </group> +</vector> ===================================== mobile/android/fenix/app/src/beta/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/beta/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/beta/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/beta/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/beta/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/beta/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/beta/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/beta/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/beta/res/values/colors.xml ===================================== @@ -4,4 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources> <color name="ic_launcher_background">@color/photonInk80</color> + <color name="tor_browser_close_tabs_notification_background">#2B8B76</color> </resources> ===================================== mobile/android/fenix/app/src/debug/res/drawable-anydpi-v24/ic_tor_browser_close_tabs_notification.xml ===================================== @@ -0,0 +1,16 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="256" + android:viewportHeight="257" + android:tint="#FFFFFF"> + <group android:scaleX="0.9164202" + android:scaleY="0.92" + android:translateX="10.69821" + android:translateY="10.28"> + <path + android:pathData="M128,256.91C198.69,256.91 256,199.6 256,128.91C256,58.22 198.69,0.91 128,0.91C57.31,0.91 0,58.22 0,128.91C0,199.6 57.31,256.91 128,256.91ZM233,128.91C233,70.92 185.99,23.91 128,23.91V39.91C177.15,39.91 217,79.75 217,128.91C217,178.06 177.15,217.91 128,217.91V233.91C185.99,233.91 233,186.9 233,128.91ZM193.75,128.91C193.75,92.6 164.31,63.16 128,63.16V79.16C155.48,79.16 177.75,101.43 177.75,128.91C177.75,156.38 155.48,178.66 128,178.66V194.66C164.31,194.66 193.75,165.22 193.75,128.91ZM128,101.66C143.05,101.66 155.25,113.86 155.25,128.91C155.25,143.96 143.05,156.16 128,156.16V101.66ZM94.04,61.23C94.36,61.18 94.46,60.77 94.2,60.59C89.25,57.25 83.29,55.31 76.87,55.31C59.75,55.31 45.87,69.16 45.87,86.24C45.87,103.33 59.75,117.18 76.87,117.18C84.6,117.18 91.66,114.35 97.09,109.69C97.34,109.48 97.19,109.08 96.86,109.07C83.98,108.56 73.7,97.99 73.7,85.01C73.7,73 82.52,63.04 94.04,61.23Z" + android:fillColor="#4A454E" + android:fillType="evenOdd"/> + </group> +</vector> ===================================== mobile/android/fenix/app/src/debug/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/debug/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/debug/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/debug/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/debug/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/debug/res/values/colors.xml ===================================== @@ -4,4 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources> <color name="ic_launcher_background">#220033</color> + <color name="tor_browser_close_tabs_notification_background">#556472</color> </resources> ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/session/PrivateNotificationService.kt ===================================== @@ -37,18 +37,27 @@ class PrivateNotificationService : AbstractPrivateNotificationService() { override val notificationsDelegate: NotificationsDelegate by lazy { components.notificationsDelegate } override fun NotificationCompat.Builder.buildNotification() { - setSmallIcon(R.drawable.ic_private_browsing) + setSmallIcon(R.drawable.ic_tor_browser_close_tabs_notification) val contentTitle = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { - applicationContext.getString(R.string.notification_erase_title_android_14) + applicationContext.getString( + R.string.notification_close_tor_browser_tabs, + applicationContext.getString(R.string.app_name), + ) } else { applicationContext.getString(R.string.app_name_private_4, getString(R.string.app_name)) } val contentText = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) { - applicationContext.getString(R.string.notification_erase_text_android_14) + applicationContext.getString( + R.string.notification_close_tor_browser_tabs_long, + applicationContext.getString(R.string.app_name), + ) } else { - applicationContext.getString(R.string.notification_pbm_delete_text_2) + applicationContext.getString( + R.string.notification_close_tor_browser_tabs, + applicationContext.getString(R.string.app_name), + ) } setContentTitle(contentTitle) @@ -56,7 +65,7 @@ class PrivateNotificationService : AbstractPrivateNotificationService() { color = ContextCompat.getColor( this@PrivateNotificationService, - R.color.pbm_notification_color, + R.color.tor_browser_close_tabs_notification_background, ) } ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -137,4 +137,10 @@  <string name="connection_assist_back_button_content_description_start_again">Start again</string> + +  + <string name="notification_close_tor_browser_tabs">Close %s’s tabs?</string> +  + <string name="notification_close_tor_browser_tabs_long">Tap or swipe this notification to close %s’s tabs</string> + </resources> ===================================== mobile/android/fenix/app/src/nightly/res/drawable-anydpi-v24/ic_tor_browser_close_tabs_notification.xml ===================================== @@ -0,0 +1,21 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="256" + android:viewportHeight="257" + android:tint="#FFFFFF"> + <group android:scaleX="1.84" + android:scaleY="1.84" + android:translateX="-107.52" + android:translateY="-107.94"> + <group android:scaleX="0.4869866" + android:scaleY="0.4888889" + android:translateX="65.66572" + android:translateY="65.67778"> + <path + android:pathData="M128,256.91C198.69,256.91 256,199.6 256,128.91C256,58.22 198.69,0.91 128,0.91C57.31,0.91 0,58.22 0,128.91C0,199.6 57.31,256.91 128,256.91ZM233,128.91C233,70.92 185.99,23.91 128,23.91V39.91C177.15,39.91 217,79.75 217,128.91C217,178.06 177.15,217.91 128,217.91V233.91C185.99,233.91 233,186.9 233,128.91ZM193.75,128.91C193.75,92.6 164.31,63.16 128,63.16V79.16C155.48,79.16 177.75,101.43 177.75,128.91C177.75,156.38 155.48,178.66 128,178.66V194.66C164.31,194.66 193.75,165.22 193.75,128.91ZM128,101.66C143.05,101.66 155.25,113.86 155.25,128.91C155.25,143.96 143.05,156.16 128,156.16V101.66ZM94.04,61.23C94.36,61.18 94.46,60.77 94.2,60.59C89.25,57.25 83.29,55.31 76.87,55.31C59.75,55.31 45.87,69.16 45.87,86.24C45.87,103.33 59.75,117.18 76.87,117.18C84.6,117.18 91.66,114.35 97.09,109.69C97.34,109.48 97.19,109.08 96.86,109.07C83.98,108.56 73.7,97.99 73.7,85.01C73.7,73 82.52,63.04 94.04,61.23Z" + android:fillColor="#4A454E" + android:fillType="evenOdd"/> + </group> + </group> +</vector> ===================================== mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/nightly/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/nightly/res/values/colors.xml ===================================== @@ -4,4 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources> <color name="ic_launcher_background">#220033</color> + <color name="tor_browser_close_tabs_notification_background">#3731A1</color> </resources> ===================================== mobile/android/fenix/app/src/release/res/drawable-anydpi-v24/ic_tor_browser_close_tabs_notification.xml ===================================== @@ -0,0 +1,21 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="256" + android:viewportHeight="257" + android:tint="#FFFFFF"> + <group android:scaleX="1.84" + android:scaleY="1.84" + android:translateX="-107.52" + android:translateY="-107.94"> + <group android:scaleX="0.4869866" + android:scaleY="0.4888889" + android:translateX="65.66572" + android:translateY="65.67778"> + <path + android:pathData="M256,128.91C256,199.6 198.69,256.91 128,256.91C57.31,256.91 0,199.6 0,128.91C0,58.22 57.31,0.91 128,0.91C198.69,0.91 256,58.22 256,128.91ZM128,23.91C185.99,23.91 233,70.92 233,128.91C233,186.9 185.99,233.91 128,233.91V217.91C177.15,217.91 217,178.06 217,128.91C217,79.75 177.15,39.91 128,39.91V23.91ZM128,63.16C164.31,63.16 193.75,92.6 193.75,128.91C193.75,165.22 164.31,194.66 128,194.66V178.66C155.48,178.66 177.75,156.38 177.75,128.91C177.75,101.43 155.48,79.16 128,79.16V63.16ZM155.25,128.91C155.25,113.86 143.05,101.66 128,101.66V156.16C143.05,156.16 155.25,143.96 155.25,128.91Z" + android:fillColor="#4A454E" + android:fillType="evenOdd"/> + </group> + </group> +</vector> ===================================== mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/release/res/drawable-hdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/release/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/release/res/drawable-mdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/release/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/release/res/drawable-xhdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/release/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png ===================================== Binary files /dev/null and b/mobile/android/fenix/app/src/release/res/drawable-xxhdpi/ic_tor_browser_close_tabs_notification.png differ ===================================== mobile/android/fenix/app/src/release/res/values/colors.xml ===================================== @@ -4,4 +4,5 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources> <color name="ic_launcher_background">@color/photonInk80</color> + <color name="tor_browser_close_tabs_notification_background">#701498</color> </resources> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/87c721… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/87c721… You're receiving this email because of your account on gitlab.torproject.org.

1 0