richard pushed to branch tor-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Tor Browser
Commits:
900fb923 by Henry Wilkes at 2024-05-16T12:56:28+01:00
fixup! Base Browser strings
Bug 42347: Add a notification for dropped OS version support.
- - - - -
4a1e3ba3 by Henry Wilkes at 2024-05-16T12:56:28+01:00
Bug 42347: Add a notification for dropped OS version support.
- - - - -
4 changed files:
- browser/base/content/browser.xhtml
- + browser/base/content/droppedSupportNotification.js
- browser/base/jar.mn
- toolkit/locales/en-US/toolkit/global/base-browser.ftl
Changes:
=====================================
browser/base/content/browser.xhtml
=====================================
@@ -132,6 +132,7 @@
Services.scriptloader.loadSubScript("chrome://browser/content/search/autocomplete-popup.js", this);
Services.scriptloader.loadSubScript("chrome://browser/content/search/searchbar.js", this);
Services.scriptloader.loadSubScript("chrome://browser/content/languageNotification.js", this);
+ Services.scriptloader.loadSubScript("chrome://browser/content/droppedSupportNotification.js", this);
window.onload = gBrowserInit.onLoad.bind(gBrowserInit);
window.onunload = gBrowserInit.onUnload.bind(gBrowserInit);
=====================================
browser/base/content/droppedSupportNotification.js
=====================================
@@ -0,0 +1,69 @@
+"use strict";
+
+// Show a prompt that a user's system will no longer be supported.
+window.addEventListener("load", () => {
+ let labelId;
+ // Expire date is 2024-10-01 (1st October 2024).
+ const isExpired = Date.now() > Date.UTC(2024, 9, 1);
+
+ if (
+ AppConstants.platform === "macosx" &&
+ Services.vc.compare(
+ Services.sysinfo.getProperty("version"),
+ "19.0" // MacOS 10.15 begins with Darwin 19.0
+ ) < 0
+ ) {
+ labelId = isExpired
+ ? "dropped-support-notification-macos-version-less-than-10-15-expired"
+ : "dropped-support-notification-macos-version-less-than-10-15";
+ } else if (
+ AppConstants.platform === "win" &&
+ Services.vc.compare(Services.sysinfo.getProperty("version"), "10.0") < 0
+ ) {
+ labelId = isExpired
+ ? "dropped-support-notification-win-os-version-less-than-10-expired"
+ : "dropped-support-notification-win-os-version-less-than-10";
+ }
+
+ const dismissedPref =
+ "browser.dropped_support_notification_v14.dismiss_version";
+
+ if (!labelId) {
+ // Avoid setting any preferences for supported versions, and clean up any
+ // old values if the user ported their profile.
+ Services.prefs.clearUserPref(dismissedPref);
+ return;
+ }
+
+ if (
+ !isExpired &&
+ Services.prefs.getStringPref(dismissedPref, "") ===
+ AppConstants.BASE_BROWSER_VERSION
+ ) {
+ // Already dismissed since the last update.
+ return;
+ }
+
+ const buttons = isExpired
+ ? undefined
+ : [
+ {
+ "l10n-id": "dropped-support-notification-dismiss-button",
+ callback: () => {
+ Services.prefs.setStringPref(
+ dismissedPref,
+ AppConstants.BASE_BROWSER_VERSION
+ );
+ },
+ },
+ ];
+
+ gNotificationBox.appendNotification(
+ "dropped-support-notification",
+ {
+ label: { "l10n-id": labelId },
+ priority: gNotificationBox.PRIORITY_WARNING_HIGH,
+ },
+ buttons
+ );
+});
=====================================
browser/base/jar.mn
=====================================
@@ -111,4 +111,5 @@ browser.jar:
content/browser/spotlight.js (content/spotlight.js)
* content/browser/default-bookmarks.html (content/default-bookmarks.html)
+ content/browser/droppedSupportNotification.js (content/droppedSupportNotification.js)
content/browser/languageNotification.js (content/languageNotification.js)
=====================================
toolkit/locales/en-US/toolkit/global/base-browser.ftl
=====================================
@@ -166,3 +166,21 @@ security-level-summary-custom = Your custom browser preferences have resulted in
# Button to undo custom changes to the security level and place the user in one of the standard security levels.
# Shown in the security level panel and settings.
security-level-restore-defaults-button = Restore defaults
+
+## Notification for dropped operating system support.
+
+# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
+# "14.0" refers to the browser versions number: Tor Browser 14.0.
+# "macOS" is a brand name, and 10.15 is the macOS version number.
+dropped-support-notification-macos-version-less-than-10-15 = The next major version of { -brand-short-name } (14.0) will no longer support this version of macOS. Please upgrade to macOS 10.15 or later by October 1st 2024 to continue receiving important security updates.
+# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
+# "macOS" is a brand name, and 10.15 is the macOS version number.
+dropped-support-notification-macos-version-less-than-10-15-expired = { -brand-short-name } no longer supports this version of macOS. Please upgrade to macOS 10.15 or later to continue receiving important security updates.
+# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
+# "14.0" refers to the browser versions number: Tor Browser 14.0.
+# "Windows" is a brand name, and "Windows 10" is the version.
+dropped-support-notification-win-os-version-less-than-10 = The next major version of { -brand-short-name } (14.0) will no longer support this version of Windows. Please upgrade to Windows 10 or later by October 1st 2024 to continue receiving important security updates.
+# "{ -brand-short-name }" will be replaced with the localized name of the browser, e.g. "Tor Browser".
+# "Windows" is a brand name, and "Windows 10" is the version.
+dropped-support-notification-win-os-version-less-than-10-expired = { -brand-short-name } no longer supports this version of Windows. Please upgrade to Windows 10 or later to continue receiving important security updates.
+dropped-support-notification-dismiss-button = Got it
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c67ac1…
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/c67ac1…
You're receiving this email because of your account on gitlab.torproject.org.
ma1 pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
1dc061f3 by hackademix at 2024-05-16T12:45:58+02:00
Bug 41148: Update NoScript license to GPL V3.
- - - - -
1 changed file:
- projects/browser/Bundle-Data/Docs/Licenses/NoScript.txt
Changes:
=====================================
projects/browser/Bundle-Data/Docs/Licenses/NoScript.txt
=====================================
@@ -1,9 +1,9 @@
NoScript - a Firefox extension for whitelist driven safe JavaScript execution
-Copyright (C) 2005-2023 Giorgio Maone - https://maone.net
+Copyright (C) 2005-2024 Giorgio Maone - https://maone.net
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1…
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/1…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch tor-browser-115.11.0esr-13.5-1 at The Tor Project / Applications / Tor Browser
Commits:
66370dbe by Pier Angelo Vendrame at 2024-05-15T10:59:36+02:00
fixup! Bug 42562: Normalized the Accepted Languages on Android.
Bug 42582: Use toLanguageTag() instead of toString()
- - - - -
1 changed file:
- mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
Changes:
=====================================
mobile/android/geckoview/src/main/java/org/mozilla/geckoview/GeckoRuntimeSettings.java
=====================================
@@ -850,7 +850,7 @@ public final class GeckoRuntimeSettings extends RuntimeSettings {
}
}
}
- String acceptLanguages = locale != null ? locale.toString().replace('_', '-') : "en-US";
+ String acceptLanguages = locale != null ? locale.toLanguageTag().replace('_', '-') : "en-US";
if (acceptLanguages.equals("en-US")) {
// For consistency with spoof English.
acceptLanguages += ", en";
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/66370db…
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/66370db…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch main at The Tor Project / Applications / tor-browser-build
Commits:
84219469 by Pier Angelo Vendrame at 2024-05-15T10:19:02+02:00
Bug 41143: Add Firefox's localization files also to GeckoView.
They are needed for formatting APIs to work as expected.
- - - - -
3 changed files:
- projects/firefox-l10n/config
- projects/geckoview/config
- projects/geckoview/merge_aars
Changes:
=====================================
projects/firefox-l10n/config
=====================================
@@ -21,11 +21,17 @@ steps:
input_files => sub {
my ($project, $options) = @_;
my @input_files;
- my $changesets_json = project_config('firefox', 'var/l10n-changesets', { %$options, origin_project => $project });
+ my $is_android = project_config($project, 'var/android', $options);
+ my $source_project = $is_android ? 'geckoview' : 'firefox';
+ my $locales_key = $is_android ? 'var/locales_mobile' : 'var/locales';
+ my $changesets_json = project_config($source_project, 'var/l10n-changesets', { %$options, origin_project => $project });
my $d = decode_json $changesets_json;
- my $locales = project_config($project, 'var/locales', $options);
+ my $locales = project_config($project, $locales_key, $options);
foreach my $loc (@$locales) {
my $locale = process_template($project, $loc, '.');
+ $locale =~ s/-r/-/;
+ $locale = "id" if ($is_android && $locale eq "in");
+ $locale = "he" if ($is_android && $locale eq "iw");
next unless my $revision = $d->{$locale}{revision};
my $input_file = {
name => $locale,
=====================================
projects/geckoview/config
=====================================
@@ -33,6 +33,8 @@ var:
gradle_dependencies_version: 12
gradle_version: 7.5.1
variant: beta
+ has_l10n: '[% !c("var/testbuild") && !c("var/locales").empty %]'
+ l10n-changesets: '[% exec("cat browser/locales/l10n-changesets.json") %]'
targets:
release:
@@ -84,6 +86,12 @@ steps:
pkg_type: build
target_prepend:
- torbrowser-android-x86_64
+ - project: firefox-l10n
+ name: firefox-l10n
+ enable: '[% c("var/has_l10n") %]'
+ pkg_type: build
+ target_prepend:
+ - torbrowser-android-armv7
list_toolchain_updates:
git_url: https://github.com/mozilla/gecko-dev.git
=====================================
projects/geckoview/merge_aars
=====================================
@@ -49,6 +49,19 @@ cp -rl $gradle_repo/maven2/* $gradle_repo || true
export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE=system
# Create .mozbuild to avoid interactive prompt in configure
mkdir "$HOME/.mozbuild"
+
+[% IF c("var/has_l10n") -%]
+ supported_locales="[% tmpl(c('var/locales_mobile').join(' ')).replace('-r', '-').replace('in', 'id').replace('iw', 'he') %]"
+ l10ncentral="$HOME/.mozbuild/l10n-central"
+ mkdir "$l10ncentral"
+ for tarball in $rootdir/[% c('input_files_by_name/firefox-l10n') %]/*; do
+ tar -C "$l10ncentral" -xf "$tarball"
+ done
+
+ # Do not setup our localization files, as we do not provide any frontend
+ # through GeckoView.
+[% END -%]
+
# We still need to specify --tor-browser-version due to bug 34005.
./mach configure \
--with-base-browser-version=[% c("var/torbrowser_version") %] \
@@ -56,6 +69,12 @@ mkdir "$HOME/.mozbuild"
[% IF !c("var/rlbox") -%]--without-wasm-sandboxed-libraries[% END %]
./mach build --verbose
+
+[% IF c('var/has_l10n') -%]
+ # No quotes on purpose, to pass each locale as an additional argument.
+ ./mach package-multi-locale --locales en-US $supported_locales
+[% END -%]
+
# We prepare an archive to then extract it as we were using a local Maven
# repository.
# See also https://github.com/mozilla-mobile/firefox-android/blob/main/fenix/docs/subs…
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8…
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/8…
You're receiving this email because of your account on gitlab.torproject.org.
ma1 pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android
Commits:
6eaa81ce by hackademix at 2024-05-15T07:39:36+02:00
fixup! Disable features and functionality
Bug 42578: Reject Android "open in Tor Browser" intent
- - - - -
1 changed file:
- fenix/app/src/main/java/org/mozilla/fenix/home/intent/HomeDeepLinkIntentProcessor.kt
Changes:
=====================================
fenix/app/src/main/java/org/mozilla/fenix/home/intent/HomeDeepLinkIntentProcessor.kt
=====================================
@@ -90,6 +90,15 @@ class HomeDeepLinkIntentProcessor(
logger.info("Not opening deep link: $url")
return
}
+ if (BuildConfig.DEEP_LINK_SCHEME.startsWith("torbrowser")) {
+ // tor-browser#42578
+ // TODO:
+ // Maybe just warn users about linkability but
+ // give them the choice to open anyway, once
+ // the other deep link related issues are fixed.
+ logger.info("Tor Browser rejects open intent deep link: $deepLink")
+ return
+ }
activity.openToBrowserAndLoad(
url,
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/6ea…
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/6ea…
You're receiving this email because of your account on gitlab.torproject.org.
richard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android
Commits:
6abe2084 by Richard Pospesel at 2024-05-14T18:44:55+00:00
fixup! Add Tor integration and UI
removed vestigal comment
- - - - -
1 changed file:
- fenix/app/src/main/AndroidManifest.xml
Changes:
=====================================
fenix/app/src/main/AndroidManifest.xml
=====================================
@@ -366,7 +366,6 @@
android:value="androidx.startup"
tools:node="remove" />
</provider>
- <!-- Define Orbotservice's TorService -->
</application>
</manifest>
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/6ab…
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/6ab…
You're receiving this email because of your account on gitlab.torproject.org.
Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android
Commits:
7b6f9fcc by Pier Angelo Vendrame at 2024-05-14T10:14:58+02:00
fixup! Add Tor integration and UI
Bug 41111 (Build): Use Lyrebird to provide WebTunnel PT Client
- - - - -
1 changed file:
- fenix/app/src/main/assets/common/torrc-defaults
Changes:
=====================================
fenix/app/src/main/assets/common/torrc-defaults
=====================================
@@ -4,7 +4,6 @@ AvoidDiskWrites 1
Log notice stdout
CookieAuthentication 1
DormantCanceledByStartup 1
-ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit exec ./libObfs4proxy.so
+ClientTransportPlugin meek_lite,obfs2,obfs3,obfs4,scramblesuit,webtunnel exec ./libObfs4proxy.so
ClientTransportPlugin snowflake exec ./libSnowflake.so
-ClientTransportPlugin webtunnel exec ./libWebtunnel.so
ClientTransportPlugin conjure exec ./libConjure.so -registerURL https://registration.refraction.network/api
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/7b6…
--
This project does not include diff previews in email notifications.
View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/7b6…
You're receiving this email because of your account on gitlab.torproject.org.