June 2025 - tor-commits - lists.torproject.org

[Git][tpo/applications/rbm][main] Bug 40084: Always use bash for the debug terminal
by boklm (＠boklm) 09 Jun '25

09 Jun '25

boklm pushed to branch main at The Tor Project / Applications / RBM Commits: 263693c9 by Beatriz Rizental at 2025-06-09T15:16:11+02:00 Bug 40084: Always use bash for the debug terminal - - - - - 1 changed file: - lib/RBM.pm Changes: ===================================== lib/RBM.pm ===================================== @@ -1291,9 +1291,10 @@ sub build_run { if (project_config($project, 'debug', $options)) { print STDERR $error, "\nOpening debug shell\n"; print STDERR "Warning: build files will be removed when you exit this shell.\n"; + my $original_term = shell_quote($ENV{TERM} || 'dumb'); my $cmd = project_config($project, "remote_exec", { %$options, - exec_cmd => "cd $remote_tmp_src; PS1='debug-$project\$ ' \${SHELL-/bin/bash}", + exec_cmd => "cd $remote_tmp_src; TERM=$original_term PS1='debug-$project\$ ' /bin/bash", exec_name => "debug-$s", exec_as_root => $scripts_root{$s}, interactive => 1, View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/263693c984a467d… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/rbm/-/commit/263693c984a467d… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-140.0a1-15.0-1-build1
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

Pier Angelo Vendrame pushed new tag mullvad-browser-140.0a1-15.0-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-140.0a1-15.0-1] 32 commits: MB 38: Mullvad Browser configuration
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

Pier Angelo Vendrame pushed to branch mullvad-browser-140.0a1-15.0-1 at The Tor Project / Applications / Mullvad Browser Commits: f2f8c7b0 by Pier Angelo Vendrame at 2025-06-09T14:34:33+02:00 MB 38: Mullvad Browser configuration - - - - - fe36d578 by Pier Angelo Vendrame at 2025-06-09T14:34:36+02:00 fixup! MB 38: Mullvad Browser configuration TB 43653: Remove the unused spoofOsInUserAgentHeader pref. - - - - - 81d8c579 by Pier Angelo Vendrame at 2025-06-09T14:34:36+02:00 MB 1: Mullvad Browser branding See also: mullvad-browser#5: Product name and directory customization mullvad-browser#12: Create new branding directories and integrate Mullvad icons+branding mullvad-browser#14: Remove Default Built-in bookmarks mullvad-browser#35: Add custom PDF icons for Windows builds mullvad-browser#48: Replace Mozilla copyright and legal trademarks in mullvadbrowser.exe metadata mullvad-browser#51: Update trademark string mullvad-browser#104: Update shipped dll metadata copyright/licensing info mullvad-browser#107: Add alpha and nightly icons - - - - - dd91f446 by Henry Wilkes at 2025-06-09T14:34:37+02:00 fixup! MB 1: Mullvad Browser branding MB 411: Set startup.homepage_override_url on mb-nightly to be used instead of app.releaseNotesURL.aboutDialog. - - - - - 00c95c6c by Henry Wilkes at 2025-06-09T14:34:37+02:00 Mullvad Browser strings This commit adds strings needed by the following Mullvad Browser patches. - - - - - 64d807af by Pier Angelo Vendrame at 2025-06-09T14:34:37+02:00 MB 20: Allow packaged-addons in PBM. We install a few addons from the distribution directory, but they are not automatically enabled for PBM mode. This commit modifies the code that installs them to also add the PBM permission to the known ones. - - - - - 4092c498 by Pier Angelo Vendrame at 2025-06-09T14:34:38+02:00 MB 63: Customize some about pages for Mullvad Browser Also: mullvad-browser#57: Purge unneeded about: pages - - - - - 7a37de83 by Pier Angelo Vendrame at 2025-06-09T14:46:01+02:00 MB 37: Customization for the about dialog - - - - - 27402bca by Henry Wilkes at 2025-06-09T14:46:04+02:00 MB 39: Add home page about:mullvad-browser - - - - - 93cb2b3f by Henry Wilkes at 2025-06-09T14:46:04+02:00 fixup! MB 39: Add home page about:mullvad-browser MB 411: Use the same update URL in about:mullvad-browser as the about dialog. - - - - - 67ea76c6 by hackademix at 2025-06-09T14:46:04+02:00 MB 97: Remove UI cues to install new extensions. - - - - - 02795f60 by hackademix at 2025-06-09T14:46:05+02:00 MB 47: uBlock Origin customization - - - - - ffe7343a by Pier Angelo Vendrame at 2025-06-09T14:46:05+02:00 MB 21: Disable the password manager This commit disables the about:login page and removes the "Login and Password" section of about:preferences. We do not do anything to the real password manager of Firefox, that is in toolkit: it contains C++ parts that make it difficult to actually prevent it from being built.. Finally, we modify the the function that opens about:login to report an error in the console so that we can quickly get a backtrace to the code that tries to use it. - - - - - 4296e61b by Pier Angelo Vendrame at 2025-06-09T14:46:06+02:00 MB 112: Updater customization for Mullvad Browser MB 71: Set the updater base URL to Mullvad domain - - - - - 12d78c5e by Henry Wilkes at 2025-06-09T14:46:06+02:00 fixup! MB 112: Updater customization for Mullvad Browser MB 411: Drop mullvadbrowser.post_update.url. Also, no longer require an override page to be set to open about:mullvad-browser after an update. - - - - - 6044fcd4 by Nicolas Vigier at 2025-06-09T14:46:07+02:00 MB 79: Add Mullvad Browser MAR signing keys MB 256: Add mullvad-browser nightly mar signing key - - - - - 4d8a26d3 by Pier Angelo Vendrame at 2025-06-09T14:46:07+02:00 MB 34: Hide unsafe and unwanted preferences UI about:preferences allow to override some of our defaults, that could be fingeprintable or have some other unwanted consequences. - - - - - 28633dd0 by Pier Angelo Vendrame at 2025-06-09T14:46:08+02:00 MB 160: Disable the cookie exceptions button Besides disabling the "Delete on close checkbox", disable also the "Manage Exceptions" button when always using PBM. - - - - - edce653e by hackademix at 2025-06-09T14:46:08+02:00 MB 163: prevent uBlock Origin from being uninstalled/disabled - - - - - abc0b3cc by Richard Pospesel at 2025-06-09T14:46:08+02:00 MB 188: Customize Gitlab Issue and Merge templates - - - - - 1411471a by Morgan at 2025-06-09T14:46:09+02:00 fixup! MB 188: Customize Gitlab Issue and Merge templates - - - - - 5d5ab465 by rui hildt at 2025-06-09T14:47:34+02:00 MB 213: Customize the search engines list MB 328: Refactor the search engine patch. Upstream switched to a completely different search engine configuration between ESR 115 and ESR 128. We moved our configuration to a couple of JSON files that do not follow upstream's schemas, as they are overcomplicated for our needs. Also, we keep the old search engine extensions for now, as upstream also kept them, and planned of removing them with Bug 1885953. - - - - - 7c27497e by hackademix at 2025-06-09T14:47:37+02:00 MB 214: Enable cross-tab identity leak protection in "quiet" mode - - - - - 22abb47b by Pier Angelo Vendrame at 2025-06-09T14:47:38+02:00 MB 80: Enable Mullvad Browser as a default browser - - - - - e60746ec by Pier Angelo Vendrame at 2025-06-09T14:47:38+02:00 MB 320: Temporarily disable WebRTC and WDBA on Windows. WebRTC should be re-enabled when tor-browser#42758 is resolved, and and the default browser agent when in general we make this feature work again. - - - - - db7dd12a by Henry Wilkes at 2025-06-09T14:47:38+02:00 MB 329: Customize toolbar for mullvad-browser. - - - - - 182438d7 by Henry Wilkes at 2025-06-09T14:47:39+02:00 Add CI for Mullvad Browser - - - - - 44371309 by Henry Wilkes at 2025-06-09T14:47:39+02:00 MB 419: Mullvad Browser migration procedures. This commit implements the the Mullvad Browser's version of _migrateUI. - - - - - 71158a0f by Pier Angelo Vendrame at 2025-06-09T14:47:40+02:00 fixup! MB 1: Mullvad Browser branding TB 43776: Mark branding files for l10n merge. - - - - - c3f5e9a6 by Pier Angelo Vendrame at 2025-06-09T14:47:40+02:00 fixup! MB 80: Enable Mullvad Browser as a default browser Comment a definition since mingw now defines it as well. - - - - - 878c58b5 by Pier Angelo Vendrame at 2025-06-09T14:47:40+02:00 fixup! MB 39: Add home page about:mullvad-browser Drop the unnecessary font CSP directive. Debug builds complain about this, and they crash with a failed assertion. - - - - - 3ebd9dbf by Pier Angelo Vendrame at 2025-06-09T15:31:41+02:00 fixup! Base Browser strings BB 43849: Remove a useless lint exclusion. Probably it was a rebase error. - - - - - 271 changed files: - .gitlab/ci/jobs/update-translations.yml - .gitlab/issue_templates/000 Bug Report.md - .gitlab/issue_templates/010 Proposal.md - .gitlab/issue_templates/020 Web Compatibility.md - .gitlab/issue_templates/030 Test.md - .gitlab/issue_templates/040 Feature.md - .gitlab/issue_templates/060 Rebase - Alpha.md - .gitlab/issue_templates/061 Rebase - Stable.md - .gitlab/issue_templates/063 Rebase - Rapid.md - .gitlab/issue_templates/090 Emergency Security Issue.md - + .gitlab/issue_templates/Rebase Browser - Alpha.md - + .gitlab/issue_templates/Rebase Browser - Rapid.md - + .gitlab/issue_templates/Rebase Browser - Stable.md - .gitlab/merge_request_templates/Default.md - + .gitlab/merge_request_templates/Rebase.md - browser/app/Makefile.in - browser/app/macbuild/Contents/Info.plist.in - browser/app/module.ver - browser/app/firefox.exe.manifest → browser/app/mullvadbrowser.exe.manifest - + browser/app/profile/000-mullvad-browser.js - browser/app/profile/001-base-profile.js - browser/base/content/aboutDialog.xhtml - browser/base/content/appmenu-viewcache.inc.xhtml - browser/base/content/browser-menubar.inc - browser/base/content/browser-places.js - browser/base/content/browser.js - browser/base/content/default-bookmarks.html - browser/base/content/nsContextMenu.sys.mjs - browser/base/content/overrides/app-license.html - browser/base/content/pageinfo/pageInfo.xhtml - browser/base/content/utilityOverlay.js - browser/branding/branding-common.mozbuild - + browser/branding/mb-alpha/VisualElements_150.png - + browser/branding/mb-alpha/VisualElements_70.png - + browser/branding/mb-alpha/configure.sh - + browser/branding/mb-alpha/content/about-logo.png - + browser/branding/mb-alpha/content/about-logo.svg - + browser/branding/mb-alpha/content/about-logo(a)2x.png - + browser/branding/mb-alpha/content/about-wordmark.svg - + browser/branding/mb-alpha/content/about.png - + browser/branding/mb-alpha/content/aboutDialog.css - + browser/branding/mb-alpha/content/firefox-wordmark.svg - + browser/branding/mb-alpha/content/icon128.png - + browser/branding/mb-alpha/content/icon16.png - + browser/branding/mb-alpha/content/icon256.png - + browser/branding/mb-alpha/content/icon32.png - + browser/branding/mb-alpha/content/icon48.png - + browser/branding/mb-alpha/content/icon64.png - + browser/branding/mb-alpha/content/jar.mn - + browser/branding/mb-alpha/content/moz.build - + browser/branding/mb-alpha/content/mullvad-branding.css - + browser/branding/mb-alpha/default128.png - + browser/branding/mb-alpha/default16.png - + browser/branding/mb-alpha/default22.png - + browser/branding/mb-alpha/default24.png - + browser/branding/mb-alpha/default256.png - + browser/branding/mb-alpha/default32.png - + browser/branding/mb-alpha/default48.png - + browser/branding/mb-alpha/default64.png - + browser/branding/mb-alpha/document.icns - + browser/branding/mb-alpha/document.ico - + browser/branding/mb-alpha/document_pdf.ico - + browser/branding/mb-alpha/firefox.icns - + browser/branding/mb-alpha/firefox.ico - + browser/branding/mb-alpha/firefox.svg - + browser/branding/mb-alpha/locales/en-US/brand.ftl - + browser/branding/mb-alpha/locales/en-US/brand.properties - + browser/branding/mb-alpha/locales/jar.mn - + browser/branding/mb-alpha/locales/moz.build - + browser/branding/mb-alpha/locales/mullvad-about-wordmark-en.ftl - + browser/branding/mb-alpha/moz.build - + browser/branding/mb-alpha/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-alpha/newtab.ico - + browser/branding/mb-alpha/newwindow.ico - + browser/branding/mb-alpha/pbmode.ico - + browser/branding/mb-alpha/pref/firefox-branding.js - + browser/branding/mb-nightly/VisualElements_150.png - + browser/branding/mb-nightly/VisualElements_70.png - + browser/branding/mb-nightly/configure.sh - + browser/branding/mb-nightly/content/about-logo.png - + browser/branding/mb-nightly/content/about-logo.svg - + browser/branding/mb-nightly/content/about-logo(a)2x.png - + browser/branding/mb-nightly/content/about-wordmark.svg - + browser/branding/mb-nightly/content/about.png - + browser/branding/mb-nightly/content/aboutDialog.css - + browser/branding/mb-nightly/content/firefox-wordmark.svg - + browser/branding/mb-nightly/content/icon128.png - + browser/branding/mb-nightly/content/icon16.png - + browser/branding/mb-nightly/content/icon256.png - + browser/branding/mb-nightly/content/icon32.png - + browser/branding/mb-nightly/content/icon48.png - + browser/branding/mb-nightly/content/icon64.png - + browser/branding/mb-nightly/content/jar.mn - + browser/branding/mb-nightly/content/moz.build - + browser/branding/mb-nightly/content/mullvad-branding.css - + browser/branding/mb-nightly/default128.png - + browser/branding/mb-nightly/default16.png - + browser/branding/mb-nightly/default22.png - + browser/branding/mb-nightly/default24.png - + browser/branding/mb-nightly/default256.png - + browser/branding/mb-nightly/default32.png - + browser/branding/mb-nightly/default48.png - + browser/branding/mb-nightly/default64.png - + browser/branding/mb-nightly/document.icns - + browser/branding/mb-nightly/document.ico - + browser/branding/mb-nightly/document_pdf.ico - + browser/branding/mb-nightly/firefox.icns - + browser/branding/mb-nightly/firefox.ico - + browser/branding/mb-nightly/firefox.svg - + browser/branding/mb-nightly/locales/en-US/brand.ftl - + browser/branding/mb-nightly/locales/en-US/brand.properties - + browser/branding/mb-nightly/locales/jar.mn - + browser/branding/mb-nightly/locales/moz.build - + browser/branding/mb-nightly/locales/mullvad-about-wordmark-en.ftl - + browser/branding/mb-nightly/moz.build - + browser/branding/mb-nightly/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-nightly/newtab.ico - + browser/branding/mb-nightly/newwindow.ico - + browser/branding/mb-nightly/pbmode.ico - + browser/branding/mb-nightly/pref/firefox-branding.js - + browser/branding/mb-release/VisualElements_150.png - + browser/branding/mb-release/VisualElements_70.png - + browser/branding/mb-release/configure.sh - + browser/branding/mb-release/content/about-logo.png - + browser/branding/mb-release/content/about-logo.svg - + browser/branding/mb-release/content/about-logo(a)2x.png - + browser/branding/mb-release/content/about-wordmark.svg - + browser/branding/mb-release/content/about.png - + browser/branding/mb-release/content/aboutDialog.css - + browser/branding/mb-release/content/firefox-wordmark.svg - + browser/branding/mb-release/content/icon128.png - + browser/branding/mb-release/content/icon16.png - + browser/branding/mb-release/content/icon256.png - + browser/branding/mb-release/content/icon32.png - + browser/branding/mb-release/content/icon48.png - + browser/branding/mb-release/content/icon64.png - + browser/branding/mb-release/content/jar.mn - + browser/branding/mb-release/content/moz.build - + browser/branding/mb-release/content/mullvad-branding.css - + browser/branding/mb-release/default128.png - + browser/branding/mb-release/default16.png - + browser/branding/mb-release/default22.png - + browser/branding/mb-release/default24.png - + browser/branding/mb-release/default256.png - + browser/branding/mb-release/default32.png - + browser/branding/mb-release/default48.png - + browser/branding/mb-release/default64.png - + browser/branding/mb-release/document.icns - + browser/branding/mb-release/document.ico - + browser/branding/mb-release/document_pdf.ico - + browser/branding/mb-release/firefox.icns - + browser/branding/mb-release/firefox.ico - + browser/branding/mb-release/firefox.svg - + browser/branding/mb-release/locales/en-US/brand.ftl - + browser/branding/mb-release/locales/en-US/brand.properties - + browser/branding/mb-release/locales/jar.mn - + browser/branding/mb-release/locales/moz.build - + browser/branding/mb-release/locales/mullvad-about-wordmark-en.ftl - + browser/branding/mb-release/moz.build - + browser/branding/mb-release/mullvadbrowser.VisualElementsManifest.xml - + browser/branding/mb-release/newtab.ico - + browser/branding/mb-release/newwindow.ico - + browser/branding/mb-release/pbmode.ico - + browser/branding/mb-release/pref/firefox-branding.js - browser/components/BrowserContentHandler.sys.mjs - browser/components/BrowserGlue.sys.mjs - browser/components/DesktopActorRegistry.sys.mjs - browser/components/about/AboutRedirector.cpp - browser/components/about/components.conf - browser/components/customizableui/CustomizableUI.sys.mjs - browser/components/moz.build - + 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.html - + browser/components/mullvad-browser/content/aboutMullvadBrowser.js - + browser/components/mullvad-browser/jar.mn - + browser/components/mullvad-browser/moz.build - browser/components/newtab/AboutNewTabRedirector.sys.mjs - browser/components/preferences/home.inc.xhtml - browser/components/preferences/main.js - browser/components/preferences/preferences.xhtml - browser/components/preferences/privacy.inc.xhtml - browser/components/preferences/privacy.js - browser/components/preferences/search.inc.xhtml - + browser/components/search/extensions/brave/favicon.svg - + browser/components/search/extensions/brave/manifest.json - + browser/components/search/extensions/ddg-html/favicon.ico - + browser/components/search/extensions/ddg-html/manifest.json - browser/components/search/extensions/ddg/manifest.json - + browser/components/search/extensions/metager/favicon.ico - + browser/components/search/extensions/metager/manifest.json - + browser/components/search/extensions/mojeek/favicon.ico - + browser/components/search/extensions/mojeek/manifest.json - + browser/components/search/extensions/mullvad-leta/favicon.svg - + browser/components/search/extensions/mullvad-leta/manifest.json - + browser/components/search/extensions/startpage/favicon.png - + browser/components/search/extensions/startpage/manifest.json - browser/components/shell/ShellService.sys.mjs - browser/components/shell/WindowsDefaultBrowser.cpp - browser/components/shell/nsWindowsShellService.cpp - browser/config/mozconfigs/base-browser - + browser/config/mozconfigs/mullvad-browser - browser/installer/package-manifest.in - browser/installer/windows/nsis/updater_append.ini - browser/locales/l10n.toml - browser/modules/HomePage.sys.mjs - browser/moz.build - browser/moz.configure - config/create_rc.py - devtools/client/aboutdebugging/src/actions/runtimes.js - devtools/client/aboutdebugging/src/components/sidebar/Sidebar.js - devtools/client/jar.mn - devtools/client/themes/images/aboutdebugging-firefox-aurora.svg - devtools/client/themes/images/aboutdebugging-firefox-beta.svg - devtools/client/themes/images/aboutdebugging-firefox-logo.svg - devtools/client/themes/images/aboutdebugging-firefox-nightly.svg - devtools/client/themes/images/aboutdebugging-firefox-release.svg - + devtools/client/themes/images/aboutdebugging-mullvadbrowser-logo.svg - docshell/base/nsAboutRedirector.cpp - docshell/build/components.conf - moz.configure - mozconfig-linux-aarch64 - mozconfig-linux-aarch64-dev - mozconfig-linux-x86_64 - mozconfig-linux-x86_64-asan - mozconfig-linux-x86_64-dev - mozconfig-macos - mozconfig-macos-dev - mozconfig-windows-x86_64 - + other-licenses/nsis/Contrib/ApplicationID/Makefile - other-licenses/nsis/Contrib/ApplicationID/Set.cpp - + other-licenses/nsis/Contrib/CityHash/Makefile - toolkit/components/extensions/child/ext-storage.js - toolkit/components/extensions/parent/ext-storage.js - toolkit/components/passwordmgr/LoginHelper.sys.mjs - toolkit/components/search/AppProvidedSearchEngine.sys.mjs - toolkit/components/search/SearchService.sys.mjs - + toolkit/components/search/content/brave.svg - + toolkit/components/search/content/duckduckgo.ico - + toolkit/components/search/content/metager.ico - + toolkit/components/search/content/mojeek.ico - + toolkit/components/search/content/mullvad-leta.svg - + toolkit/components/search/content/mullvadBrowserSearchEngineIcons.json - + toolkit/components/search/content/mullvadBrowserSearchEngines.json - + toolkit/components/search/content/startpage.png - + toolkit/components/search/jar.mn - toolkit/components/search/moz.build - toolkit/components/securitylevel/SecurityLevel.sys.mjs - + toolkit/content/aboutRightsMullvad.xhtml - + toolkit/content/aboutTelemetryMullvad.xhtml - toolkit/content/jar.mn - toolkit/content/widgets/moz-support-link/moz-support-link.mjs - + toolkit/locales/en-US/toolkit/global/mullvad-browser.ftl - toolkit/mozapps/defaultagent/EventLog.h - toolkit/mozapps/defaultagent/SetDefaultBrowser.cpp - toolkit/mozapps/extensions/AddonManager.sys.mjs - toolkit/mozapps/extensions/content/aboutaddons.css - toolkit/mozapps/extensions/internal/XPIDatabase.sys.mjs - toolkit/mozapps/extensions/internal/XPIProvider.sys.mjs - toolkit/mozapps/update/updater/nightly_aurora_level3_primary.der - toolkit/mozapps/update/updater/nightly_aurora_level3_secondary.der - toolkit/mozapps/update/updater/release_primary.der - toolkit/mozapps/update/updater/release_secondary.der - + toolkit/themes/shared/icons/mullvadbrowser.png - toolkit/themes/shared/minimal-toolkit.jar.inc.mn - toolkit/xre/nsAppRunner.cpp - tools/lint/fluent-lint/exclusions.yml - widget/windows/WinTaskbar.cpp - widget/windows/moz.build The diff was not included because it is too large. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/fe… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/fe… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-140.0a1-15.0-1] fixup! Base Browser strings
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

Pier Angelo Vendrame pushed to branch base-browser-140.0a1-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 31278d7b by Pier Angelo Vendrame at 2025-06-09T15:33:02+02:00 fixup! Base Browser strings BB 43849: Remove a useless lint exclusion. Probably it was a rebase error. - - - - - 1 changed file: - tools/lint/fluent-lint/exclusions.yml Changes: ===================================== tools/lint/fluent-lint/exclusions.yml ===================================== @@ -84,9 +84,6 @@ ID01: - unknownProtocolFound-title - unknownSocketType-title - unsafeContentType-title - - # toolkit/locales/en-US/toolkit/global/base-browser.ftl - - basebrowser-about-dialog-version files: # policies-descriptions.ftl # These IDs are generated programmatically from policy names. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/31278d7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/31278d7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-140.0a1-15.0-1] fixup! Base Browser strings
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

Pier Angelo Vendrame pushed to branch tor-browser-140.0a1-15.0-1 at The Tor Project / Applications / Tor Browser Commits: 7ff9d211 by Pier Angelo Vendrame at 2025-06-09T15:10:39+02:00 fixup! Base Browser strings BB 43849: Remove a useless lint exclusion. Probably it was a rebase error. - - - - - 1 changed file: - tools/lint/fluent-lint/exclusions.yml Changes: ===================================== tools/lint/fluent-lint/exclusions.yml ===================================== @@ -84,9 +84,6 @@ ID01: - unknownProtocolFound-title - unknownSocketType-title - unsafeContentType-title - - # toolkit/locales/en-US/toolkit/global/base-browser.ftl - - basebrowser-about-dialog-version files: # policies-descriptions.ftl # These IDs are generated programmatically from policy names. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7ff9d21… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7ff9d21… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-140.0a1-15.0-1
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

Pier Angelo Vendrame pushed new branch mullvad-browser-140.0a1-15.0-1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/mullv… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag FIREFOX_NIGHTLY_140_END
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

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

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag base-browser-140.0a1-15.0-1-build1
by Pier Angelo Vendrame (＠pierov) 09 Jun '25

09 Jun '25

Pier Angelo Vendrame pushed new tag base-browser-140.0a1-15.0-1-build1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/base-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41444: Temporarily disable artifact generation for macos and windows
by boklm (＠boklm) 09 Jun '25

09 Jun '25

boklm pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: 95699a34 by Nicolas Vigier at 2025-06-06T09:01:42+02:00 Bug 41444: Temporarily disable artifact generation for macos and windows - - - - - 2 changed files: - projects/browser/build - projects/firefox/build Changes: ===================================== projects/browser/build ===================================== @@ -429,7 +429,7 @@ cd $distdir popd [% END %] -[% IF c("var/nightly") -%] +[% IF c("var/nightly") && c("var/linux") -%] mkdir -p "$OUTDIR"/artifacts cp -r $rootdir/[% c('input_files_by_name/firefox') %]/artifacts "$OUTDIR" [% END %] ===================================== projects/firefox/build ===================================== @@ -128,7 +128,7 @@ echo "Starting ./mach build $(date)" ./mach build stage-package [% END -%] -[% IF c("var/nightly") -%] +[% IF c("var/nightly") && c("var/linux") -%] echo "Building development artifacts" ./mach package View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/9… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.11.0esr-14.5-1] 3 commits: fixup! TB 40026 [android]: Implement Security Level settings on Android.
by Dan Ballard (＠dan) 05 Jun '25

05 Jun '25

Dan Ballard pushed to branch tor-browser-128.11.0esr-14.5-1 at The Tor Project / Applications / Tor Browser Commits: 1f3d54f3 by clairehurst at 2025-06-04T12:43:41+02:00 fixup! TB 40026 [android]: Implement Security Level settings on Android. TB 43786: Add new UX flow for changing security level (Android) - - - - - 4c264ede by clairehurst at 2025-06-04T12:43:41+02:00 fixup! [android] Implement Android-native Connection Assist UI TB 43786: Add new UX flow for changing security level (Android) - - - - - 80613d52 by clairehurst at 2025-06-04T12:43:42+02:00 fixup! [android] TBA strings TB 43786: Add new UX flow for changing security level (Android) - - - - - 18 changed files: - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt - mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt - mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - − mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt - − mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/SecurityLevel.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevel.kt - + mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevelFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - + mobile/android/fenix/app/src/main/res/layout/fragment_tor_security_level_preferences.xml - mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml - mobile/android/fenix/app/src/main/res/values/preference_keys.xml - mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml - mobile/android/fenix/app/src/main/res/xml/preferences.xml - − mobile/android/fenix/app/src/main/res/xml/tor_security_level_preferences.xml Changes: ===================================== mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngine.kt ===================================== @@ -1335,9 +1335,7 @@ class GeckoEngine( override var torSecurityLevel: Int get() = runtime.settings.torSecurityLevel set(value) { - value.let { - runtime.settings.torSecurityLevel = it - } + runtime.settings.torSecurityLevel = value } override var spoofEnglish: Boolean ===================================== mobile/android/android-components/components/concept/engine/src/main/java/mozilla/components/concept/engine/Settings.kt ===================================== @@ -254,6 +254,12 @@ abstract class Settings { /** * Setting to control the current security level + * + * 4 -> STANDARD + * + * 2 -> SAFER + * + * 1 -> SAFEST */ open var torSecurityLevel: Int by UnsupportedSetting() ===================================== mobile/android/android-components/components/feature/search/src/main/java/mozilla/components/feature/search/SearchUseCases.kt ===================================== @@ -76,12 +76,7 @@ class SearchUseCases( flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(), additionalHeaders: Map<String, String>? = null, ) { - var securityLevel: Int - try { - securityLevel = settings?.torSecurityLevel ?: 0 - } catch (e: UnsupportedSettingException) { - securityLevel = 0 - } + val securityLevel : Int = settings!!.torSecurityLevel val searchUrl = searchEngine?.let { searchEngine.buildSearchUrl(searchTerms, securityLevel) } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms, securityLevel) @@ -172,12 +167,7 @@ class SearchUseCases( flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(), additionalHeaders: Map<String, String>? = null, ) { - var securityLevel: Int - try { - securityLevel = settings?.torSecurityLevel ?: 0 - } catch (e: UnsupportedSettingException) { - securityLevel = 0 - } + val securityLevel : Int = settings!!.torSecurityLevel val searchUrl = searchEngine?.let { searchEngine.buildSearchUrl(searchTerms, securityLevel) } ?: store.state.search.selectedOrDefaultSearchEngine?.buildSearchUrl(searchTerms, securityLevel) ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -1439,6 +1439,15 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorAn private const val PWA_RECENTLY_USED_THRESHOLD = DateUtils.DAY_IN_MILLIS * 30L } + fun restartApplication() { + startActivity( + Intent(applicationContext, HomeActivity::class.java).addFlags( + Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK, + ), + ) + shutDown() + } + fun shutDown() : Nothing { finishAndRemoveTask() exitProcess(0) ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Core.kt ===================================== @@ -157,7 +157,7 @@ class Core( cookieBannerHandlingGlobalRules = context.settings().shouldEnableCookieBannerGlobalRules, cookieBannerHandlingGlobalRulesSubFrames = context.settings().shouldEnableCookieBannerGlobalRulesSubFrame, emailTrackerBlockingPrivateBrowsing = false, - torSecurityLevel = context.settings().torSecurityLevel().intRepresentation, + torSecurityLevel = context.settings().torSecurityLevel, spoofEnglish = context.settings().spoofEnglish, ) ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt ===================================== @@ -13,6 +13,7 @@ import android.os.Build import android.os.Bundle import android.os.Handler import android.os.Looper +import android.util.Log import android.view.LayoutInflater import android.view.WindowManager import android.widget.Toast @@ -67,7 +68,7 @@ import org.mozilla.fenix.ext.showToolbar import org.mozilla.fenix.nimbus.FxNimbus import org.mozilla.fenix.perf.ProfilerViewModel import org.mozilla.fenix.settings.account.AccountUiView -import org.mozilla.fenix.tor.SecurityLevel +import org.mozilla.fenix.tor.TorSecurityLevel import org.mozilla.fenix.tor.QuickstartViewModel import org.mozilla.fenix.utils.Settings import kotlin.system.exitProcess @@ -353,7 +354,7 @@ class SettingsFragment : PreferenceFragmentCompat(), UserInteractionHandler { SettingsFragmentDirections.actionSettingsFragmentToPrivateBrowsingFragment() } - resources.getString(R.string.pref_key_tor_security_level_settings) -> { + resources.getString(R.string.pref_key_tor_security_level) -> { SettingsFragmentDirections.actionSettingsFragmentToTorSecurityLevelFragment() } @@ -852,14 +853,14 @@ class SettingsFragment : PreferenceFragmentCompat(), UserInteractionHandler { @VisibleForTesting internal fun setupSecurityLevelPreference() { val securityLevelPreference = - requirePreference<Preference>(R.string.pref_key_tor_security_level_settings) - securityLevelPreference.summary = context?.settings()?.torSecurityLevel()?.let { - when (it) { - SecurityLevel.STANDARD -> getString(R.string.tor_security_level_standard_option) - SecurityLevel.SAFER -> getString(R.string.tor_security_level_safer_option) - SecurityLevel.SAFEST -> getString(R.string.tor_security_level_safest_option) + requirePreference<Preference>(R.string.pref_key_tor_security_level) + securityLevelPreference.summary = + when (requireContext().settings().torSecurityLevel) { + TorSecurityLevel.STANDARD.level -> getString(R.string.tor_security_level_standard) + TorSecurityLevel.SAFER.level -> getString(R.string.tor_security_level_safer) + TorSecurityLevel.SAFEST.level -> getString(R.string.tor_security_level_safest) + else -> throw Exception("Unexpected TorSecurityLevel of ${requireContext().settings().torSecurityLevel}") } - } } @VisibleForTesting ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/TorSecurityLevelFragment.kt deleted ===================================== @@ -1,81 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.settings - -import android.os.Bundle -import androidx.preference.PreferenceFragmentCompat -import org.mozilla.fenix.R -import org.mozilla.fenix.ext.components -import org.mozilla.fenix.ext.settings -import org.mozilla.fenix.ext.showToolbar -import org.mozilla.fenix.tor.SecurityLevel -import org.mozilla.fenix.tor.SecurityLevelUtil -import org.mozilla.fenix.utils.view.GroupableRadioButton -import org.mozilla.fenix.utils.view.addToRadioGroup -import org.mozilla.fenix.utils.view.uncheckAll - -/** - * Lets the user choose their security level - */ -@Suppress("SpreadOperator") -class TorSecurityLevelFragment : PreferenceFragmentCompat() { - private val securityLevelRadioGroups = mutableListOf<GroupableRadioButton>() - private var previousSecurityLevel: SecurityLevel? = null - - override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { - setPreferencesFromResource(R.xml.tor_security_level_preferences, rootKey) - - val currentLevel: SecurityLevel? = context?.components?.let { - try { - SecurityLevelUtil.getSecurityLevelFromInt( - it.core.engine.settings.torSecurityLevel - ) - } catch (e: IllegalStateException) { - // The default state is 0. If we get an invalid state then - // default to Standard (4). - SecurityLevel.STANDARD - } - } - - if (currentLevel == null) { - throw IllegalStateException("context or Components is null.") - } - - val radioSafer = bindSecurityLevelRadio(SecurityLevel.SAFER) - val radioSafest = bindSecurityLevelRadio(SecurityLevel.SAFEST) - val radioStandard = bindSecurityLevelRadio(SecurityLevel.STANDARD) - - securityLevelRadioGroups.addAll(mutableListOf(radioSafer, radioSafest, radioStandard)) - // `*` is Kotlin's "spread" operator, for expanding an Array as a vararg. - addToRadioGroup(*securityLevelRadioGroups.toTypedArray()) - - securityLevelRadioGroups.uncheckAll() - val securityLevelRadioButton = requirePreference<RadioButtonPreference>(currentLevel.preferenceKey) - // Cache this for later comparison in the OnPreferenceChangeListener - previousSecurityLevel = currentLevel - securityLevelRadioButton.setCheckedWithoutClickListener(true) - } - - private fun bindSecurityLevelRadio( - level: SecurityLevel - ): RadioButtonPreference { - val radio = requirePreference<RadioButtonPreference>(level.preferenceKey) - - radio.summary = getString(level.contentDescriptionRes) - - radio.apply { - setOnPreferenceChangeListener<Boolean> { preference, isChecked -> - if (isChecked && (previousSecurityLevel!! != level)) { - preference.context.components.core.engine.settings.torSecurityLevel = - level.intRepresentation - previousSecurityLevel = level - } - true - } - } - - return radio - } -} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/SecurityLevel.kt deleted ===================================== @@ -1,53 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.mozilla.fenix.tor - -import android.os.Parcelable -import androidx.annotation.StringRes -import kotlinx.parcelize.Parcelize -import org.mozilla.fenix.R - - -const val SECURITY_LEVEL_STANDARD = 4 -const val SECURITY_LEVEL_SAFER = 2 -const val SECURITY_LEVEL_SAFEST = 1 - -@Parcelize -enum class SecurityLevel( - @StringRes val preferenceKey: Int, - @StringRes val contentDescriptionRes: Int, - val intRepresentation: Int -) : Parcelable { - - STANDARD( - preferenceKey = R.string.pref_key_tor_security_level_standard_option, - contentDescriptionRes = R.string.tor_security_level_standard_description, - intRepresentation = SECURITY_LEVEL_STANDARD - ), - SAFER( - preferenceKey = R.string.pref_key_tor_security_level_safer_option, - contentDescriptionRes = R.string.tor_security_level_safer_description, - intRepresentation = SECURITY_LEVEL_SAFER - ), - SAFEST( - preferenceKey = R.string.pref_key_tor_security_level_safest_option, - contentDescriptionRes = R.string.tor_security_level_safest_description, - intRepresentation = SECURITY_LEVEL_SAFEST - ); - - - -} - -object SecurityLevelUtil { - fun getSecurityLevelFromInt(level: Int): SecurityLevel { - return when (level) { - SECURITY_LEVEL_STANDARD -> SecurityLevel.STANDARD - SECURITY_LEVEL_SAFER -> SecurityLevel.SAFER - SECURITY_LEVEL_SAFEST -> SecurityLevel.SAFEST - else -> throw IllegalStateException("Security Level $level is not valid") - } - } -} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt ===================================== @@ -343,7 +343,7 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler { if (screen.torBootstrapButton2ShouldOpenSettings) { openTorConnectionSettings() } else if (screen.torBootstrapButton2ShouldRestartApp) { - restartApplication() + (requireActivity() as HomeActivity).restartApplication() } else { torConnectionAssistViewModel.cancelTorBootstrap() } @@ -404,15 +404,6 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler { openSettings(requireContext().getString(R.string.pref_key_connection)) } - private fun restartApplication() { - startActivity( - Intent(requireContext(), HomeActivity::class.java).addFlags( - Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK, - ), - ) - Runtime.getRuntime().exit(0) - } - override fun onBackPressed(): Boolean { torConnectionAssistViewModel.handleBackButtonPressed(requireActivity() as HomeActivity) return true ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevel.kt ===================================== @@ -0,0 +1,13 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.tor + +import android.os.Parcelable +import kotlinx.parcelize.Parcelize + +@Parcelize +enum class TorSecurityLevel(val level: Int) : Parcelable { + STANDARD(4), SAFER(2), SAFEST(1) +} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevelFragment.kt ===================================== @@ -0,0 +1,144 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.mozilla.fenix.tor + +import android.content.Context +import android.os.Bundle +import android.util.Log +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.Toast +import androidx.appcompat.content.res.AppCompatResources +import androidx.fragment.app.Fragment +import org.mozilla.fenix.HomeActivity +import org.mozilla.fenix.R +import org.mozilla.fenix.ext.components +import org.mozilla.fenix.databinding.FragmentTorSecurityLevelPreferencesBinding +import androidx.core.content.edit + +class TorSecurityLevelFragment : Fragment() { + private var _binding: FragmentTorSecurityLevelPreferencesBinding? = null + private val binding get() = _binding!! + + private val tag = "TorSecurityLevelFrag" + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle?, + ): View { + _binding = FragmentTorSecurityLevelPreferencesBinding.inflate( + inflater, container, false, + ) + + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + binding.description.text = getString(R.string.tor_security_level_warning, getString(R.string.app_name)) + + updateSaveAndRestartButtonUI() + + val currentLevel: Int = requireContext().components.core.engine.settings.torSecurityLevel + + when (currentLevel) { + TorSecurityLevel.STANDARD.level -> { + binding.standardPreference.text = + getString(R.string.tor_security_level_standard_current_level) + binding.securityLevelRadioGroup.check(binding.standardPreference.id) + } + + TorSecurityLevel.SAFER.level -> { + binding.saferPreference.text = + getString(R.string.tor_security_level_safer_current_level) + binding.securityLevelRadioGroup.check(binding.saferPreference.id) + } + + TorSecurityLevel.SAFEST.level -> { + binding.safestPreference.text = + getString(R.string.tor_security_level_safest_current_level) + binding.securityLevelRadioGroup.check(binding.safestPreference.id) + } + } + + binding.securityLevelRadioGroup.setOnCheckedChangeListener { _, checkedId -> + binding.saveAndRestartButton.isEnabled = when (checkedId) { + binding.standardPreference.id -> currentLevel != TorSecurityLevel.STANDARD.level + binding.saferPreference.id -> currentLevel != TorSecurityLevel.SAFER.level + binding.safestPreference.id -> currentLevel != TorSecurityLevel.SAFEST.level + else -> throw Exception("unexpected checkedID of $checkedId") + } + + updateSaveAndRestartButtonUI() + } + + binding.saveAndRestartButton.setOnClickListener { + + Toast.makeText( + requireContext(), + R.string.tor_security_level_restarting, + Toast.LENGTH_SHORT, + ).show() + + val selectedSecurityLevel: Int = + when (binding.securityLevelRadioGroup.checkedRadioButtonId) { + binding.standardPreference.id -> TorSecurityLevel.STANDARD.level + binding.saferPreference.id -> TorSecurityLevel.SAFER.level + binding.safestPreference.id -> TorSecurityLevel.SAFEST.level + else -> throw Exception("Unexpected checkedRadioButtonId of ${binding.securityLevelRadioGroup.checkedRadioButtonId}") + } + + requireContext().components.core.geckoRuntime.settings.torSecurityLevel = selectedSecurityLevel + + requireActivity().getSharedPreferences("fenix_preferences", Context.MODE_PRIVATE).edit( + commit = true, + ) { + putInt( + requireContext().getString(R.string.pref_key_tor_security_level), + selectedSecurityLevel, + ) + } + + Thread.sleep(1000) + + (requireActivity() as HomeActivity).restartApplication() + } + + binding.cancelButton.setOnClickListener { + requireActivity().onBackPressed() + } + } + + private fun updateSaveAndRestartButtonUI() { + binding.saveAndRestartButton.apply { + if (binding.saveAndRestartButton.isEnabled) { + backgroundTintList = AppCompatResources.getColorStateList( + requireContext(), + R.color.connect_button_purple, + ) + setTextColor( + AppCompatResources.getColorStateList( + requireContext(), + R.color.photonLightGrey05, + ), + ) + } else { + backgroundTintList = AppCompatResources.getColorStateList( + requireContext(), + R.color.disabled_connect_button_purple, + ) + setTextColor( + AppCompatResources.getColorStateList( + requireContext(), + R.color.disabled_text_gray_purple, + ), + ) + } + } + } +} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -52,7 +52,8 @@ import org.mozilla.fenix.settings.registerOnSharedPreferenceChangeListener import org.mozilla.fenix.settings.sitepermissions.AUTOPLAY_BLOCK_ALL import org.mozilla.fenix.settings.sitepermissions.AUTOPLAY_BLOCK_AUDIBLE import org.mozilla.fenix.wallpapers.Wallpaper -import org.mozilla.fenix.tor.SecurityLevel +import org.mozilla.fenix.settings.SettingsFragment +import org.mozilla.fenix.tor.TorSecurityLevel import java.security.InvalidParameterException import java.util.UUID @@ -299,31 +300,55 @@ class Settings(private val appContext: Context) : PreferencesHolder { false, ) - var standardSecurityLevel by booleanPreference( - appContext.getPreferenceKey(SecurityLevel.STANDARD.preferenceKey), - default = true + private var oldStandardSecurityLevel by booleanPreference( + appContext.getPreferenceKey(R.string.pref_key_tor_security_level_standard_option), + default = false ) - var saferSecurityLevel by booleanPreference( - appContext.getPreferenceKey(SecurityLevel.SAFER.preferenceKey), + private var oldSaferSecurityLevel by booleanPreference( + appContext.getPreferenceKey(R.string.pref_key_tor_security_level_safer_option), default = false ) - var safestSecurityLevel by booleanPreference( - appContext.getPreferenceKey(SecurityLevel.SAFEST.preferenceKey), + private var oldSafestSecurityLevel by booleanPreference( + appContext.getPreferenceKey(R.string.pref_key_tor_security_level_safest_option), default = false ) - // torSecurityLevel is defined as the first |true| preference, - // beginning at the safest level. - // If multiple preferences are true, then that is a bug and the - // highest |true| security level is chosen. - // Standard is the default level. - fun torSecurityLevel(): SecurityLevel = when { - safestSecurityLevel -> SecurityLevel.SAFEST - saferSecurityLevel -> SecurityLevel.SAFER - standardSecurityLevel -> SecurityLevel.STANDARD - else -> SecurityLevel.STANDARD + /** + * Backing property that should used only for the [SettingsFragment] UI + * + * 4 -> STANDARD + * + * 2 -> SAFER + * + * 1 -> SAFEST + */ + var torSecurityLevel by intPreference( + appContext.getPreferenceKey(R.string.pref_key_tor_security_level), + migrateTorSecurityLevel() ?: 4, + ) + + /** + * Remove in 15.0 release. + */ + private fun migrateTorSecurityLevel(): Int? { + return when { + oldSafestSecurityLevel -> { + TorSecurityLevel.SAFEST.level + } + oldSaferSecurityLevel -> { + TorSecurityLevel.SAFER.level + } + oldStandardSecurityLevel -> { + TorSecurityLevel.STANDARD.level + } + else -> null + }.also { + oldSafestSecurityLevel = false + oldSaferSecurityLevel = false + oldStandardSecurityLevel = false + } } var spoofEnglish by booleanPreference( ===================================== mobile/android/fenix/app/src/main/res/layout/fragment_tor_security_level_preferences.xml ===================================== @@ -0,0 +1,117 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <TextView + android:id="@+id/description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:lineSpacingExtra="6dp" + android:paddingHorizontal="24dp" + android:paddingVertical="16dp" + android:text="@string/tor_security_level_warning" + android:textColor="@color/photonLightGrey40" + android:textSize="14sp" + app:layout_constraintTop_toTopOf="parent" /> + + <RadioGroup + android:id="@+id/security_level_radio_group" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginHorizontal="16dp" + app:layout_constraintTop_toBottomOf="@+id/description"> + + <RadioButton + android:id="@+id/standard_preference" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/tor_security_level_standard" + android:textColor="@color/photonLightGrey05" + android:textSize="16sp" /> + + <TextView + android:id="@+id/standard_preference_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="32dp" + android:text="@string/tor_security_level_standard_description" + android:textColor="@color/photonLightGrey40" /> + + <RadioButton + android:id="@+id/safer_preference" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/tor_security_level_safer" + android:textColor="@color/photonLightGrey05" + android:textSize="16sp" /> + + <TextView + android:id="@+id/safer_preference_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="32dp" + android:text="@string/tor_security_level_safer_description" + android:textColor="@color/photonLightGrey40" /> + + <RadioButton + android:id="@+id/safest_preference" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/tor_security_level_safest" + android:textColor="@color/photonLightGrey05" + android:textSize="16sp" /> + + <TextView + android:id="@+id/safest_preference_description" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="32dp" + android:text="@string/tor_security_level_safest_description" + android:textColor="@color/photonLightGrey40" /> + </RadioGroup> + + <Button + android:id="@+id/save_and_restart_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="24dp" + android:layout_marginEnd="24dp" + android:layout_marginBottom="8dp" + android:background="@drawable/rounded_corners" + android:backgroundTint="@color/connect_button_purple" + android:enabled="false" + android:minWidth="360dp" + android:text="@string/tor_security_level_save_and_restart_tor_browser" + android:textAlignment="center" + android:textAllCaps="false" + android:textColor="@color/photonLightGrey05" + android:textSize="14sp" + android:textStyle="bold" + app:layout_constraintBottom_toTopOf="@id/cancel_button" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> + + <Button + android:id="@+id/cancel_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="24dp" + android:layout_marginEnd="24dp" + android:layout_marginBottom="8dp" + android:background="@drawable/rounded_corners" + android:backgroundTint="@color/configure_connection_button_white" + android:minWidth="360dp" + android:text="@string/btn_cancel" + android:textAlignment="center" + android:textAllCaps="false" + android:textColor="@color/photonDarkGrey90" + android:textSize="14sp" + android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" /> +</androidx.constraintlayout.widget.ConstraintLayout> ===================================== mobile/android/fenix/app/src/main/res/navigation/nav_graph.xml ===================================== @@ -907,7 +907,7 @@ android:label="@string/preferences_customize" /> <fragment android:id="@+id/torSecurityLevelFragment" - android:name="org.mozilla.fenix.settings.TorSecurityLevelFragment" + android:name="org.mozilla.fenix.tor.TorSecurityLevelFragment" android:label="@string/preferences_tor_security_level_options" /> <fragment android:id="@+id/privateBrowsingFragment" ===================================== mobile/android/fenix/app/src/main/res/values/preference_keys.xml ===================================== @@ -406,6 +406,9 @@ <string name="pref_key_https_everywhere_removed" translatable="false">pref_key_https_everywhere_removed</string>  + <string name="pref_key_tor_security_level" translatable="false">pref_key_tor_security_level</string> + +  <string name="pref_key_tor_security_level_settings" translatable="false">pref_key_tor_security_level_settings</string> <string name="pref_key_tor_security_level_standard_option" translatable="false">pref_key_tor_security_level_standard_option</string> <string name="pref_key_tor_security_level_safer_option" translatable="false">pref_key_tor_security_level_safer_option</string> ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -36,12 +36,19 @@ <string name="preferences_tor_security_level_options">Security Level</string>  - <string name="tor_security_level_standard_option">Standard</string> +  + <string name="tor_security_level_warning">You will need to restart %s to apply any changes. This will close all tabs.</string> + <string name="tor_security_level_standard">Standard</string> + <string name="tor_security_level_standard_current_level">Standard (current level)</string> <string name="tor_security_level_standard_description">All Tor Browser and website features are enabled.</string> - <string name="tor_security_level_safer_option">Safer</string> + <string name="tor_security_level_safer">Safer</string> + <string name="tor_security_level_safer_current_level">Safer (current level)</string> <string name="tor_security_level_safer_description">Disable website features that are often dangerous, causing some sites to lose functionality.</string> - <string name="tor_security_level_safest_option">Safest</string> + <string name="tor_security_level_safest">Safest</string> + <string name="tor_security_level_safest_current_level">Safest (current level)</string> <string name="tor_security_level_safest_description">Only allow website features required for static sites and basic services. These changes affect images, media, and scripts.</string> + <string name="tor_security_level_save_and_restart_tor_browser">Save and restart</string> + <string name="tor_security_level_restarting">Restarting</string> <string name="btn_cancel">Cancel</string> ===================================== mobile/android/fenix/app/src/main/res/xml/preferences.xml ===================================== @@ -103,7 +103,7 @@ android:layout="@layout/preference_category_no_icon_style"> <androidx.preference.Preference - android:key="@string/pref_key_tor_security_level_settings" + android:key="@string/pref_key_tor_security_level" app:iconSpaceReserved="false" android:title="@string/preferences_tor_security_level_options" /> ===================================== mobile/android/fenix/app/src/main/res/xml/tor_security_level_preferences.xml deleted ===================================== @@ -1,21 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - <org.mozilla.fenix.settings.RadioButtonPreference - android:defaultValue="true" - android:key="@string/pref_key_tor_security_level_standard_option" - android:summary="@string/tor_security_level_standard_description" - android:title="@string/tor_security_level_standard_option" /> - <org.mozilla.fenix.settings.RadioButtonPreference - android:defaultValue="false" - android:key="@string/pref_key_tor_security_level_safer_option" - android:summary="@string/tor_security_level_safer_description" - android:title="@string/tor_security_level_safer_option" /> - <org.mozilla.fenix.settings.RadioButtonPreference - android:defaultValue="false" - android:key="@string/pref_key_tor_security_level_safest_option" - android:summary="@string/tor_security_level_safest_description" - android:title="@string/tor_security_level_safest_option" /> -</androidx.preference.PreferenceScreen> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/298a04… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/298a04… You're receiving this email because of your account on gitlab.torproject.org.

1 0