- tbb-commits - lists.torproject.org

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Add Tor integration and UI
by Dan Ballard (＠dan) 07 Feb '24

07 Feb '24

Dan Ballard pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: f276a2cb by clairehurst at 2024-02-07T23:25:03+00:00 fixup! Add Tor integration and UI - - - - - 1 changed file: - fenix/app/src/main/res/navigation/nav_graph.xml Changes: ===================================== fenix/app/src/main/res/navigation/nav_graph.xml ===================================== @@ -683,10 +683,6 @@ app:exitAnim="@anim/slide_out_left" app:popEnterAnim="@anim/slide_in_left" app:popExitAnim="@anim/slide_out_right" /> - app:enterAnim="@anim/slide_in_right" - app:exitAnim="@anim/slide_out_left" - app:popEnterAnim="@anim/slide_in_left" - app:popExitAnim="@anim/slide_out_right" /> <action android:id="@+id/action_settingsFragment_to_trackingProtectionFragment" app:destination="@id/trackingProtectionFragment" View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/f27… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/f27… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.7.0esr-13.5-1] fixup! Bug 32308: use direct browser sizing for letterboxing.
by ma1 (＠ma1) 07 Feb '24

07 Feb '24

ma1 pushed to branch mullvad-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 800f6ebf by hackademix at 2024-02-07T18:53:36+01:00 fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 42389: make the betterboxing gradient actually work. - - - - - 1 changed file: - browser/base/content/browser.css Changes: ===================================== browser/base/content/browser.css ===================================== @@ -168,7 +168,6 @@ body { .letterboxing.letterboxing-gradient .browserContainer { background: linear-gradient(283deg, var(--letterboxing-gradient-color1) 0%, var(--letterboxing-gradient-color2) 100%), var(--letterboxing-bgcolor); - box-shadow: rgba(0, 0, 0, 0.5) 0px -1px 2px; } :root:not([inDOMFullscreen]) .letterboxing .browserContainer:not(.responsive-mode) @@ -231,12 +230,12 @@ body { border-top-right-radius: var(--letterboxing-border-top-radius); width: var(--letterboxing-width) !important; height: var(--letterboxing-height) !important; + background: var(--letterboxing-gradient-color2); } :root:not([inDOMFullscreen]) .letterboxing.letterboxing-ready .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) { place-content: var(--letterboxing-vertical-alignment) center; - background: var(--letterboxing-bgcolor); } #toolbar-menubar[autohide="true"] { View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/800… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/800… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.7.0esr-13.5-1] 2 commits: fixup! Bug 32308: use direct browser sizing for letterboxing.
by ma1 (＠ma1) 07 Feb '24

07 Feb '24

ma1 pushed to branch base-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 444cf832 by hackademix at 2024-02-07T18:50:54+01:00 fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 42387: hide visual artifacts and fix the status label on rounded letterboxing borders. - - - - - 1926178c by hackademix at 2024-02-07T18:51:02+01:00 fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 42389: make the betterboxing gradient actually work. - - - - - 3 changed files: - browser/base/content/browser.css - browser/base/content/tabbrowser.js - toolkit/components/resistfingerprinting/RFPHelper.sys.mjs Changes: ===================================== browser/base/content/browser.css ===================================== @@ -127,6 +127,11 @@ body { -moz-window-dragging: drag; } +/** + Never modify the following selector without synchronizing + LETTERBOX_CSS_SELECTOR in RFPHelper.sys.jsm, where + --letterboxing-width & --letterboxing-height are actually set. +**/ .letterboxing .browserContainer { /* From Firefox 115 on, .browserContainer layout is flex / column, @@ -137,6 +142,14 @@ body { background: var(--letterboxing-bgcolor); } +.browserDecorator { + display: none; + pointer-events: none; + background: transparent; + position: relative; + z-index: 1; +} + .letterboxing { --letterboxing-border-radius: 8px; --letterboxing-border-top-radius: 0; @@ -145,6 +158,7 @@ body { --letterboxing-bgcolor: var(--tabpanel-background-color); --letterboxing-gradient-color1: var(--letterboxing-bgcolor); --letterboxing-gradient-color2: color-mix(in srgb, var(--chrome-content-separator-color) 50%, var(--letterboxing-bgcolor)); + --letterboxing-border-color: var(--letterboxing-bgcolor); } .letterboxing.letterboxing-vcenter .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) { @@ -154,7 +168,26 @@ body { .letterboxing.letterboxing-gradient .browserContainer { background: linear-gradient(283deg, var(--letterboxing-gradient-color1) 0%, var(--letterboxing-gradient-color2) 100%), var(--letterboxing-bgcolor); - box-shadow: rgba(0, 0, 0, 0.5) 0px -1px 2px; +} + +:root:not([inDOMFullscreen]) .letterboxing .browserContainer:not(.responsive-mode) + > .browserStack:not(.exclude-letterboxing) + > .browserDecorator { + display: initial; + visibility: visible; + border-radius: var(--letterboxing-border-radius); + border-top-left-radius: var(--letterboxing-border-top-radius); + border-top-right-radius: var(--letterboxing-border-top-radius); + box-shadow: var(--letterboxing-border-color) 0px 0px .1px inset, var(--letterboxing-border-color) 0 0 .1px; + border: .1px solid var(--letterboxing-border-color); + outline: .1px solid var(--letterboxing-bgcolor); + height: calc(var(--letterboxing-height) + 1px); + top: -1px; +} + +.letterboxing-vcenter .browserDecorator { + height: auto !important; + top: 0 !important; } /* @@ -167,6 +200,7 @@ body { place-self: end left; left: 0; right: 0; + z-index: 2; --letterboxing-status-left-radius: var(--letterboxing-border-radius); --letterboxing-status-right-radius: 0; } @@ -184,18 +218,19 @@ body { .letterboxing .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) #statuspanel-label { border-radius: 0 0 var(--letterboxing-status-right-radius) var(--letterboxing-status-left-radius); + margin: 0; + border: 1px solid var(--letterboxing-border-color); + max-width: calc(var(--letterboxing-width) * .5); } -/** - Never modify the following selector without synchronizing - LETTERBOX_CSS_SELECTOR in RFPHelper.jsm! -**/ .letterboxing .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) > browser { - /* width & height to be dynamically set by RFPHelper.jsm */ box-shadow: 0px 4px 8px 0px var(--letterboxing-shadow-color); border-radius: var(--letterboxing-border-radius); border-top-left-radius: var(--letterboxing-border-top-radius); border-top-right-radius: var(--letterboxing-border-top-radius); + width: var(--letterboxing-width) !important; + height: var(--letterboxing-height) !important; + background: var(--letterboxing-gradient-color2); } :root:not([inDOMFullscreen]) .letterboxing.letterboxing-ready .browserContainer:not(.responsive-mode) ===================================== browser/base/content/tabbrowser.js ===================================== @@ -2238,6 +2238,10 @@ stack.className = "browserStack"; stack.appendChild(b); + let decorator = document.createXULElement("hbox"); + decorator.className = "browserDecorator"; + stack.appendChild(decorator); + let browserContainer = document.createXULElement("vbox"); browserContainer.className = "browserContainer"; browserContainer.appendChild(notificationbox); ===================================== toolkit/components/resistfingerprinting/RFPHelper.sys.mjs ===================================== @@ -447,8 +447,7 @@ class _RFPHelper { // find the rule applying the default letterboxing styles to browsers // preemptively in order to beat race conditions on tab/window creation const LETTERBOX_CSS_URL = "chrome://browser/content/browser.css"; - const LETTERBOX_CSS_SELECTOR = - ".letterboxing .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) > browser"; + const LETTERBOX_CSS_SELECTOR = ".letterboxing .browserContainer"; for (let ss of document.styleSheets) { if (ss.href !== LETTERBOX_CSS_URL) { continue; @@ -572,8 +571,8 @@ class _RFPHelper { const r = (width, height) => { lastRoundedSize = {width, height}; return { - width: `var(--rdm-width, ${width}px)`, - height: `var(--rdm-height, ${height}px)`, + "--letterboxing-width": `var(--rdm-width, ${width}px)`, + "--letterboxing-height": `var(--rdm-height, ${height}px)`, } }; @@ -637,7 +636,7 @@ class _RFPHelper { for (let [name, value] of Object.entries(props)) { if (style[name] !== value) { this.push(() => { - style.setProperty(name, value, "important"); + style.setProperty(name, value); }); } } @@ -668,8 +667,11 @@ class _RFPHelper { ? // optional UI components such as the notification box, the find bar // or devtools are constraining this browser's size: recompute custom roundDimensions(parentWidth, parentHeight) - : { width: "", height: "" }; // otherwise we can keep the default (rounded) size - styleChanges.queueIfNeeded(aBrowser, roundedInline); + : { + "--letterboxing-width": "", + "--letterboxing-height": "", + }; // otherwise we can keep the default (rounded) size + styleChanges.queueIfNeeded(browserParent, roundedInline); if (lastRoundedSize) { // check wether the letterboxing margin is less than the border radius, and if so flatten the borders View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f7199b… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f7199b… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.7.0esr-13.5-1] fixup! Bug 32308: use direct browser sizing for letterboxing.
by ma1 (＠ma1) 07 Feb '24

07 Feb '24

ma1 pushed to branch tor-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: c13c55f4 by hackademix at 2024-02-07T18:42:34+01:00 fixup! Bug 32308: use direct browser sizing for letterboxing. Bug 42389: make the betterboxing gradient actually work. - - - - - 1 changed file: - browser/base/content/browser.css Changes: ===================================== browser/base/content/browser.css ===================================== @@ -168,7 +168,6 @@ body { .letterboxing.letterboxing-gradient .browserContainer { background: linear-gradient(283deg, var(--letterboxing-gradient-color1) 0%, var(--letterboxing-gradient-color2) 100%), var(--letterboxing-bgcolor); - box-shadow: rgba(0, 0, 0, 0.5) 0px -1px 2px; } :root:not([inDOMFullscreen]) .letterboxing .browserContainer:not(.responsive-mode) @@ -231,12 +230,12 @@ body { border-top-right-radius: var(--letterboxing-border-top-radius); width: var(--letterboxing-width) !important; height: var(--letterboxing-height) !important; + background: var(--letterboxing-gradient-color2); } :root:not([inDOMFullscreen]) .letterboxing.letterboxing-ready .browserContainer:not(.responsive-mode) > .browserStack:not(.exclude-letterboxing) { place-content: var(--letterboxing-vertical-alignment) center; - background: var(--letterboxing-bgcolor); } #toolbar-menubar[autohide="true"] { View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c13c55f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c13c55f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.7.0esr-13.5-1] fixup! Base Browser's .mozconfigs.
by richard (＠richard) 07 Feb '24

07 Feb '24

richard pushed to branch base-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: f7199bf2 by Pier Angelo Vendrame at 2024-02-07T16:59:56+00:00 fixup! Base Browser's .mozconfigs. Bug 42399: Start minifying JS again - - - - - 2 changed files: - browser/config/mozconfigs/base-browser-android - mozconfig-android-all Changes: ===================================== browser/config/mozconfigs/base-browser-android ===================================== @@ -15,9 +15,6 @@ ac_add_options --with-android-ndk=$ANDROID_NDK_HOME ac_add_options --with-android-min-sdk=21 ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle -# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568 -ac_add_options --enable-minify=properties - ac_add_options --enable-strip ac_add_options --enable-install-strip ac_add_options --disable-tests @@ -39,6 +36,7 @@ if test -n "$LOCAL_DEV_BUILD"; then # You must use the "default" bogus channel for dev builds ac_add_options --enable-update-channel=default ac_add_options --with-base-browser-version=dev-build + ac_add_options --disable-minify fi if test -z "$WASI_SYSROOT"; then ===================================== mozconfig-android-all ===================================== @@ -3,14 +3,12 @@ export MOZILLA_OFFICIAL=1 ac_add_options --enable-application=mobile/android ac_add_options --disable-compile-environment -# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568 -ac_add_options --enable-minify=properties - if test -n "$LOCAL_DEV_BUILD"; then # You must use the "default" bogus channel for dev builds ac_add_options --enable-update-channel=default ac_add_options --without-wasm-sandboxed-libraries ac_add_options --with-base-browser-version=dev-build + ac_add_options --disable-minify fi ac_add_options --with-tor-browser-version=dev-build View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f7199bf… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/f7199bf… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.7.0esr-13.5-1] fixup! Base Browser's .mozconfigs.
by richard (＠richard) 07 Feb '24

07 Feb '24

richard pushed to branch tor-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 0cf32f89 by Pier Angelo Vendrame at 2024-02-07T17:04:25+01:00 fixup! Base Browser's .mozconfigs. Bug 42399: Start minifying JS again - - - - - 2 changed files: - browser/config/mozconfigs/base-browser-android - mozconfig-android-all Changes: ===================================== browser/config/mozconfigs/base-browser-android ===================================== @@ -15,9 +15,6 @@ ac_add_options --with-android-ndk=$ANDROID_NDK_HOME ac_add_options --with-android-min-sdk=21 ac_add_options --with-gradle=$GRADLE_HOME/bin/gradle -# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568 -ac_add_options --enable-minify=properties - ac_add_options --enable-strip ac_add_options --enable-install-strip ac_add_options --disable-tests @@ -39,6 +36,7 @@ if test -n "$LOCAL_DEV_BUILD"; then # You must use the "default" bogus channel for dev builds ac_add_options --enable-update-channel=default ac_add_options --with-base-browser-version=dev-build + ac_add_options --disable-minify fi if test -z "$WASI_SYSROOT"; then ===================================== mozconfig-android-all ===================================== @@ -3,14 +3,12 @@ export MOZILLA_OFFICIAL=1 ac_add_options --enable-application=mobile/android ac_add_options --disable-compile-environment -# https://bugzilla.mozilla.org/show_bug.cgi?id=1758568 -ac_add_options --enable-minify=properties - if test -n "$LOCAL_DEV_BUILD"; then # You must use the "default" bogus channel for dev builds ac_add_options --enable-update-channel=default ac_add_options --without-wasm-sandboxed-libraries ac_add_options --with-base-browser-version=dev-build + ac_add_options --disable-minify fi ac_add_options --with-java-bin-path=$JAVA_HOME/bin View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0cf32f8… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0cf32f8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.7.0esr-13.5-1] 2 commits: fixup! Bug 9173: Change the default Firefox profile directory to be relative.
by Pier Angelo Vendrame (＠pierov) 07 Feb '24

07 Feb '24

Pier Angelo Vendrame pushed to branch base-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 374f008f by Pier Angelo Vendrame at 2024-02-07T16:38:26+01:00 fixup! Bug 9173: Change the default Firefox profile directory to be relative. Add a method to query whether the browser is in portable mode. - - - - - 87805801 by Pier Angelo Vendrame at 2024-02-07T16:38:26+01:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Allow running the postupdate process and change the update directory for when not running in portable mode. - - - - - 3 changed files: - toolkit/mozapps/update/updater/updater.cpp - toolkit/xre/nsIXREDirProvider.idl - toolkit/xre/nsXREDirProvider.cpp Changes: ===================================== toolkit/mozapps/update/updater/updater.cpp ===================================== @@ -2807,7 +2807,7 @@ int LaunchCallbackAndPostProcessApps(int argc, NS_tchar** argv, #endif if (argc > callbackIndex) { -#if defined(XP_WIN) && !defined(BASE_BROWSER_UPDATE) +#if defined(XP_WIN) if (gSucceeded) { if (!LaunchWinPostProcess(gInstallDirPath, gPatchDirPath)) { fprintf(stderr, "The post update process was not launched"); ===================================== toolkit/xre/nsIXREDirProvider.idl ===================================== @@ -20,4 +20,9 @@ interface nsIXREDirProvider : nsISupports * Gets the hash for the current installation directory. */ AString getInstallHash(); + + /** + * Tells whether the browser has been started in portable mode. + */ + readonly attribute bool isPortableMode; }; ===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -1109,7 +1109,14 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult, rv = GetUserDataDirectory(getter_AddRefs(updRoot), false); NS_ENSURE_SUCCESS(rv, rv); # else - rv = GetUserDataDirectoryHome(getter_AddRefs(updRoot), false); + bool isPortable = true; + rv = GetIsPortableMode(&isPortable); + NS_ENSURE_SUCCESS(rv, rv); + if (isPortable) { + rv = GetUserDataDirectoryHome(getter_AddRefs(updRoot), false); + } else { + rv = GetUserDataDirectory(getter_AddRefs(updRoot), true); + } NS_ENSURE_SUCCESS(rv, rv); # endif rv = updRoot->AppendNative("UpdateInfo"_ns); @@ -1324,6 +1331,20 @@ nsresult nsXREDirProvider::GetPortableDataDir(nsIFile** aFile, } #endif +NS_IMETHODIMP nsXREDirProvider::GetIsPortableMode(bool* aIsPortableMode) { +#ifdef RELATIVE_DATA_DIR + if (gDataDirPortable) { + *aIsPortableMode = *gDataDirPortable; + } else { + nsCOMPtr<nsIFile> dir; + GetPortableDataDir(getter_AddRefs(dir), *aIsPortableMode); + } +#else + *aIsPortableMode = false; +#endif + return NS_OK; +} + nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) { // Copied from nsAppFileLocationProvider (more or less) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e9d1e5… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/e9d1e5… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.7.0esr-13.5-1] fixup! Bug 9173: Change the default Firefox profile directory to be relative.
by Pier Angelo Vendrame (＠pierov) 07 Feb '24

07 Feb '24

Pier Angelo Vendrame pushed to branch tor-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: c78c48e7 by Pier Angelo Vendrame at 2024-02-07T16:34:15+01:00 fixup! Bug 9173: Change the default Firefox profile directory to be relative. Add a method to query whether the browser is in portable mode. - - - - - 2 changed files: - toolkit/xre/nsIXREDirProvider.idl - toolkit/xre/nsXREDirProvider.cpp Changes: ===================================== toolkit/xre/nsIXREDirProvider.idl ===================================== @@ -20,4 +20,9 @@ interface nsIXREDirProvider : nsISupports * Gets the hash for the current installation directory. */ AString getInstallHash(); + + /** + * Tells whether the browser has been started in portable mode. + */ + readonly attribute bool isPortableMode; }; ===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -1334,6 +1334,20 @@ nsresult nsXREDirProvider::GetPortableDataDir(nsIFile** aFile, } #endif +NS_IMETHODIMP nsXREDirProvider::GetIsPortableMode(bool* aIsPortableMode) { +#ifdef RELATIVE_DATA_DIR + if (gDataDirPortable) { + *aIsPortableMode = *gDataDirPortable; + } else { + nsCOMPtr<nsIFile> dir; + GetPortableDataDir(getter_AddRefs(dir), *aIsPortableMode); + } +#else + *aIsPortableMode = false; +#endif + return NS_OK; +} + nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) { // Copied from nsAppFileLocationProvider (more or less) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c78c48e… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/c78c48e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.7.0esr-13.5-1] 3 commits: fixup! Bug 9173: Change the default Firefox profile directory to be relative.
by Pier Angelo Vendrame (＠pierov) 07 Feb '24

07 Feb '24

Pier Angelo Vendrame pushed to branch mullvad-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Mullvad Browser Commits: 3ea5b1dc by Pier Angelo Vendrame at 2024-02-07T15:27:23+00:00 fixup! Bug 9173: Change the default Firefox profile directory to be relative. Add a method to query whether the browser is in portable mode. - - - - - 7c5facb8 by Pier Angelo Vendrame at 2024-02-07T15:27:23+00:00 fixup! Bug 4234: Use the Firefox Update Process for Base Browser. Allow running the postupdate process and change the update directory for when not running in portable mode. - - - - - 438c7fe9 by Pier Angelo Vendrame at 2024-02-07T15:27:23+00:00 fixup! MB 112: Updater customization for Mullvad Browser MB 200: Enable system installs for Mullvad Browser Customize the post update executable name, to avoid any confusion with Mozilla's helper.exe, since we intend using a much simpler post update binary. - - - - - 4 changed files: - browser/installer/windows/nsis/updater_append.ini - toolkit/mozapps/update/updater/updater.cpp - toolkit/xre/nsIXREDirProvider.idl - toolkit/xre/nsXREDirProvider.cpp Changes: ===================================== browser/installer/windows/nsis/updater_append.ini ===================================== @@ -7,6 +7,8 @@ [PostUpdateWin] ; ExeRelPath is the path to the PostUpdateWin executable relative to the ; application executable. -ExeRelPath=uninstall\helper.exe +ExeRelPath=postupdate.exe ; ExeArg is the argument to pass to the PostUpdateWin exe +; We do not need any argument, but an empty string here will make updater.exe +; not run this step. ExeArg=/PostUpdate ===================================== toolkit/mozapps/update/updater/updater.cpp ===================================== @@ -2807,7 +2807,7 @@ int LaunchCallbackAndPostProcessApps(int argc, NS_tchar** argv, #endif if (argc > callbackIndex) { -#if defined(XP_WIN) && !defined(BASE_BROWSER_UPDATE) +#if defined(XP_WIN) if (gSucceeded) { if (!LaunchWinPostProcess(gInstallDirPath, gPatchDirPath)) { fprintf(stderr, "The post update process was not launched"); ===================================== toolkit/xre/nsIXREDirProvider.idl ===================================== @@ -20,4 +20,9 @@ interface nsIXREDirProvider : nsISupports * Gets the hash for the current installation directory. */ AString getInstallHash(); + + /** + * Tells whether the browser has been started in portable mode. + */ + readonly attribute bool isPortableMode; }; ===================================== toolkit/xre/nsXREDirProvider.cpp ===================================== @@ -1109,7 +1109,14 @@ nsresult nsXREDirProvider::GetUpdateRootDir(nsIFile** aResult, rv = GetUserDataDirectory(getter_AddRefs(updRoot), false); NS_ENSURE_SUCCESS(rv, rv); # else - rv = GetUserDataDirectoryHome(getter_AddRefs(updRoot), false); + bool isPortable = true; + rv = GetIsPortableMode(&isPortable); + NS_ENSURE_SUCCESS(rv, rv); + if (isPortable) { + rv = GetUserDataDirectoryHome(getter_AddRefs(updRoot), false); + } else { + rv = GetUserDataDirectory(getter_AddRefs(updRoot), true); + } NS_ENSURE_SUCCESS(rv, rv); # endif rv = updRoot->AppendNative("UpdateInfo"_ns); @@ -1324,6 +1331,20 @@ nsresult nsXREDirProvider::GetPortableDataDir(nsIFile** aFile, } #endif +NS_IMETHODIMP nsXREDirProvider::GetIsPortableMode(bool* aIsPortableMode) { +#ifdef RELATIVE_DATA_DIR + if (gDataDirPortable) { + *aIsPortableMode = *gDataDirPortable; + } else { + nsCOMPtr<nsIFile> dir; + GetPortableDataDir(getter_AddRefs(dir), *aIsPortableMode); + } +#else + *aIsPortableMode = false; +#endif + return NS_OK; +} + nsresult nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal) { // Copied from nsAppFileLocationProvider (more or less) View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/7f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/compare/7f… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.7.0esr-13.5-1] 2 commits: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in...
by richard (＠richard) 07 Feb '24

07 Feb '24

richard pushed to branch tor-browser-115.7.0esr-13.5-1 at The Tor Project / Applications / Tor Browser Commits: 9419bbc3 by Henry Wilkes at 2024-02-07T12:54:41+00:00 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Bug 41814: Use "Tor bridge" instead of "vanilla bridge". - - - - - b90988c5 by Henry Wilkes at 2024-02-07T12:54:41+00:00 fixup! Tor Browser strings Bug 41814: Use "Tor bridge" instead of "vanilla bridge". - - - - - 3 changed files: - browser/components/torpreferences/content/connectionPane.js - browser/components/torpreferences/content/provideBridgeDialog.js - browser/locales/en-US/browser/tor-browser.ftl Changes: ===================================== browser/components/torpreferences/content/connectionPane.js ===================================== @@ -665,12 +665,15 @@ const gBridgeGrid = { row.cells.push({ element, focusEl, columnIndex, row }); } - // TODO: properly handle "vanilla" bridges? - document.l10n.setAttributes( - row.element.querySelector(".tor-bridges-type-cell"), - "tor-bridges-type-prefix", - { type: details?.transport ?? "vanilla" } - ); + const transport = details?.transport ?? "vanilla"; + const typeCell = row.element.querySelector(".tor-bridges-type-cell"); + if (transport === "vanilla") { + document.l10n.setAttributes(typeCell, "tor-bridges-type-prefix-generic"); + } else { + document.l10n.setAttributes(typeCell, "tor-bridges-type-prefix", { + type: transport, + }); + } row.element.querySelector(".tor-bridges-address-cell").textContent = bridgeLine; ===================================== browser/components/torpreferences/content/provideBridgeDialog.js ===================================== @@ -474,12 +474,18 @@ const gProvideBridgeDialog = { emojiBlock.append(cell); } - // TODO: properly handle "vanilla" bridges? - document.l10n.setAttributes( - rowEl.querySelector(".tor-bridges-type-cell"), - "tor-bridges-type-prefix", - { type: details?.transport ?? "vanilla" } - ); + const transport = details?.transport ?? "vanilla"; + const typeCell = rowEl.querySelector(".tor-bridges-type-cell"); + if (transport === "vanilla") { + document.l10n.setAttributes( + typeCell, + "tor-bridges-type-prefix-generic" + ); + } else { + document.l10n.setAttributes(typeCell, "tor-bridges-type-prefix", { + type: transport, + }); + } rowEl.querySelector(".tor-bridges-address-cell").textContent = bridgeLine; ===================================== browser/locales/en-US/browser/tor-browser.ftl ===================================== @@ -82,6 +82,8 @@ tor-bridges-built-in-status-connected = Connected # Shown at the start of a Tor bridge line. # $type (String) - The Tor bridge type ("snowflake", "obfs4", "meek-azure"). tor-bridges-type-prefix = { $type } bridge: +# Shown at the start of a Tor bridge line, when the transport type is unknown (or "vanilla"). +tor-bridges-type-prefix-generic = Tor bridge: # The name and accessible description for a bridge emoji cell. Each bridge address can be hashed into four emojis shown to the user (bridgemoji feature). This cell corresponds to a *single* such emoji. The "title" should just be emojiName. The "aria-description" should give screen reader users enough of a hint that the cell contains a single emoji. # $emojiName (String) - The name of the emoji, already localized. # E.g. with Orca screen reader in en-US this would read "unicorn. Row 2 Column 2. Emoji". View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f8f90f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/f8f90f… You're receiving this email because of your account on gitlab.torproject.org.

1 0