- tor-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser] Pushed new branch mullvad-browser-115.12.0esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 10 Jun '24

10 Jun '24

Pier Angelo Vendrame pushed new branch mullvad-browser-115.12.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser -- This project does not include diff previews in email notifications. 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/firefox-android][firefox-android-115.2.1-13.0-1] Bug 1889066 - Adds property to LoadUrlAction to determine if we should include...
by ma1 (＠ma1) 10 Jun '24

10 Jun '24

ma1 pushed to branch firefox-android-115.2.1-13.0-1 at The Tor Project / Applications / firefox-android Commits: ae8ac932 by hackademix at 2024-06-10T20:31:40+02:00 Bug 1889066 - Adds property to LoadUrlAction to determine if we should include a parentEngineSession when loading a URL r=android-reviewers,amejiamarmol [bp tb42621] - - - - - 9 changed files: - android-components/components/browser/state/src/main/java/mozilla/components/browser/state/action/BrowserAction.kt - android-components/components/browser/state/src/main/java/mozilla/components/browser/state/engine/middleware/CreateEngineSessionMiddleware.kt - android-components/components/browser/state/src/main/java/mozilla/components/browser/state/engine/middleware/EngineDelegateMiddleware.kt - android-components/components/browser/state/src/main/java/mozilla/components/browser/state/engine/middleware/LinkingMiddleware.kt - android-components/components/browser/state/src/test/java/mozilla/components/browser/state/engine/middleware/EngineDelegateMiddlewareTest.kt - android-components/components/browser/state/src/test/java/mozilla/components/browser/state/engine/middleware/LinkingMiddlewareTest.kt - android-components/components/feature/session/src/main/java/mozilla/components/feature/session/SessionUseCases.kt - android-components/components/feature/session/src/test/java/mozilla/components/feature/session/SessionUseCasesTest.kt - android-components/components/feature/tabs/src/main/java/mozilla/components/feature/tabs/TabsUseCases.kt Changes: ===================================== android-components/components/browser/state/src/main/java/mozilla/components/browser/state/action/BrowserAction.kt ===================================== @@ -959,6 +959,7 @@ sealed class EngineAction : BrowserAction() { override val tabId: String, val skipLoading: Boolean = false, val followupAction: BrowserAction? = null, + val includeParent: Boolean = false, ) : EngineAction(), ActionWithTab /** @@ -969,6 +970,7 @@ sealed class EngineAction : BrowserAction() { val url: String, val flags: EngineSession.LoadUrlFlags = EngineSession.LoadUrlFlags.none(), val additionalHeaders: Map<String, String>? = null, + val includeParent: Boolean = false, ) : EngineAction(), ActionWithTab /** @@ -1075,6 +1077,7 @@ sealed class EngineAction : BrowserAction() { val engineSession: EngineSession, val timestamp: Long = Clock.elapsedRealtime(), val skipLoading: Boolean = false, + val includeParent: Boolean = false, ) : EngineAction(), ActionWithTab /** ===================================== android-components/components/browser/state/src/main/java/mozilla/components/browser/state/engine/middleware/CreateEngineSessionMiddleware.kt ===================================== @@ -68,6 +68,7 @@ internal class CreateEngineSessionMiddleware( logger, store, action.tabId, + action.includeParent, ) action.followupAction?.let { @@ -84,6 +85,7 @@ private fun getOrCreateEngineSession( logger: Logger, store: Store<BrowserState, BrowserAction>, tabId: String, + includeParent: Boolean, ): EngineSession? { val tab = store.state.findTabOrCustomTab(tabId) if (tab == null) { @@ -101,7 +103,7 @@ private fun getOrCreateEngineSession( return it } - return createEngineSession(engine, logger, store, tab) + return createEngineSession(engine, logger, store, tab, includeParent) } @MainThread @@ -110,6 +112,7 @@ private fun createEngineSession( logger: Logger, store: Store<BrowserState, BrowserAction>, tab: SessionState, + includeParent: Boolean, ): EngineSession { val engineSession = engine.createSession(tab.content.private, tab.contextId) logger.debug("Created engine session for tab ${tab.id}") @@ -126,6 +129,7 @@ private fun createEngineSession( tab.id, engineSession, skipLoading = skipLoading, + includeParent = includeParent, ), ) ===================================== android-components/components/browser/state/src/main/java/mozilla/components/browser/state/engine/middleware/EngineDelegateMiddleware.kt ===================================== @@ -60,11 +60,11 @@ internal class EngineDelegateMiddleware( // session is already pointing to. Creating an EngineSession will do exactly // that in the linking step. So let's do that. Otherwise we would load the URL // twice. - store.dispatch(EngineAction.CreateEngineSessionAction(action.tabId)) + store.dispatch(EngineAction.CreateEngineSessionAction(action.tabId, includeParent = action.includeParent)) return@launch } - val parentEngineSession = if (tab is TabSessionState) { + val parentEngineSession = if (action.includeParent && tab is TabSessionState) { tab.parentId?.let { store.state.findTabOrCustomTab(it)?.engineState?.engineSession } } else { null ===================================== android-components/components/browser/state/src/main/java/mozilla/components/browser/state/engine/middleware/LinkingMiddleware.kt ===================================== @@ -37,7 +37,13 @@ internal class LinkingMiddleware( when (action) { is TabListAction.AddTabAction -> { if (action.tab.engineState.engineSession != null && action.tab.engineState.engineObserver == null) { - engineObserver = link(context, action.tab.engineState.engineSession, action.tab) + engineObserver = link( + context, + action.tab.engineState.engineSession, + action.tab, + skipLoading = true, + includeParent = false, + ) } } is TabListAction.AddMultipleTabsAction -> { @@ -58,7 +64,7 @@ internal class LinkingMiddleware( when (action) { is EngineAction.LinkEngineSessionAction -> { context.state.findTabOrCustomTab(action.tabId)?.let { tab -> - engineObserver = link(context, action.engineSession, tab, action.skipLoading) + engineObserver = link(context, action.engineSession, tab, action.skipLoading, action.includeParent) } } else -> { @@ -77,6 +83,7 @@ internal class LinkingMiddleware( engineSession: EngineSession, tab: SessionState, skipLoading: Boolean = true, + includeParent: Boolean, ): Pair<String, EngineObserver> { val observer = EngineObserver(tab.id, context.store) engineSession.register(observer) @@ -91,7 +98,7 @@ internal class LinkingMiddleware( // tab, but opened by an extension e.g. via browser.tabs.update. performLoadOnMainThread(engineSession, tab.content.url, loadFlags = tab.engineState.initialLoadFlags) } else { - val parentEngineSession = if (tab is TabSessionState) { + val parentEngineSession = if (includeParent && tab is TabSessionState) { tab.parentId?.let { context.state.findTabOrCustomTab(it)?.engineState?.engineSession } } else { null ===================================== android-components/components/browser/state/src/test/java/mozilla/components/browser/state/engine/middleware/EngineDelegateMiddlewareTest.kt ===================================== @@ -258,6 +258,7 @@ class EngineDelegateMiddlewareTest { EngineAction.LoadUrlAction( "test-tab", "https://www.firefox.com", + includeParent = true, ), ).joinBlocking() ===================================== android-components/components/browser/state/src/test/java/mozilla/components/browser/state/engine/middleware/LinkingMiddlewareTest.kt ===================================== @@ -91,7 +91,9 @@ class LinkingMiddlewareTest { store.dispatch(EngineAction.LinkEngineSessionAction(parent.id, parentEngineSession)).joinBlocking() val childEngineSession: EngineSession = mock() - store.dispatch(EngineAction.LinkEngineSessionAction(child.id, childEngineSession)).joinBlocking() + store.dispatch( + EngineAction.LinkEngineSessionAction(child.id, childEngineSession, includeParent = true), + ).joinBlocking() dispatcher.scheduler.advanceUntilIdle() ===================================== android-components/components/feature/session/src/main/java/mozilla/components/feature/session/SessionUseCases.kt ===================================== @@ -86,14 +86,8 @@ class SessionUseCases( // If we already have an engine session load Url directly to prevent // context switches. if (engineSession != null) { - val parentEngineSession = if (tab is TabSessionState) { - tab.parentId?.let { store.state.findTabOrCustomTab(it)?.engineState?.engineSession } - } else { - null - } engineSession.loadUrl( url = url, - parent = parentEngineSession, flags = flags, additionalHeaders = additionalHeaders, ) ===================================== android-components/components/feature/session/src/test/java/mozilla/components/feature/session/SessionUseCasesTest.kt ===================================== @@ -128,7 +128,6 @@ class SessionUseCasesTest { middleware.assertNotDispatched(EngineAction.LoadUrlAction::class) verify(childEngineSession).loadUrl( url = "https://www.mozilla.org/en-CA/firefox/browsers/mobile/", - parent = engineSession, ) middleware.assertLastAction(EngineAction.OptimizedLoadUrlTriggeredAction::class) { action -> assertEquals("bugzilla", action.tabId) ===================================== android-components/components/feature/tabs/src/main/java/mozilla/components/feature/tabs/TabsUseCases.kt ===================================== @@ -189,6 +189,7 @@ class TabsUseCases( tab.id, url, flags, + includeParent = true, ), ) } @@ -259,6 +260,7 @@ class TabsUseCases( tab.id, url, flags, + includeParent = true, ), ) } @@ -477,6 +479,7 @@ class TabsUseCases( tab.id, url, flags, + includeParent = true, ), ) tab.id View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/ae8… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/ae8… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser] Pushed new branch tor-browser-115.12.0esr-13.0-1
by Pier Angelo Vendrame (＠pierov) 10 Jun '24

10 Jun '24

Pier Angelo Vendrame pushed new branch tor-browser-115.12.0esr-13.0-1 at The Tor Project / Applications / Tor Browser -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/tor-brows… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-115.11.0esr-13.0-1] Bug 1828259 - Close XUL popup when entering/exiting fullscreen; r=smaug
by ma1 (＠ma1) 10 Jun '24

10 Jun '24

ma1 pushed to branch mullvad-browser-115.11.0esr-13.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 262d3d99 by Edgar Chen at 2024-06-10T20:24:04+02:00 Bug 1828259 - Close XUL popup when entering/exiting fullscreen; r=smaug Differential Revision: https://phabricator.services.mozilla.com/D209355 - - - - - 1 changed file: - xpfe/appshell/AppWindow.cpp Changes: ===================================== xpfe/appshell/AppWindow.cpp ===================================== @@ -3018,6 +3018,9 @@ void AppWindow::FullscreenChanged(bool aInFullscreen) { void AppWindow::FinishFullscreenChange(bool aInFullscreen) { mFullscreenChangeState = FullscreenChangeState::NotChanging; + if (nsXULPopupManager* pm = nsXULPopupManager::GetInstance()) { + pm->Rollup({}); + } if (mDocShell) { if (nsCOMPtr<nsPIDOMWindowOuter> ourWindow = mDocShell->GetWindow()) { ourWindow->FinishFullscreenChange(aInFullscreen); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/262… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/262… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-115.11.0esr-13.0-1] Bug 1828259 - Close XUL popup when entering/exiting fullscreen; r=smaug
by ma1 (＠ma1) 10 Jun '24

10 Jun '24

ma1 pushed to branch base-browser-115.11.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 89e409e8 by Edgar Chen at 2024-06-10T20:20:59+02:00 Bug 1828259 - Close XUL popup when entering/exiting fullscreen; r=smaug Differential Revision: https://phabricator.services.mozilla.com/D209355 - - - - - 1 changed file: - xpfe/appshell/AppWindow.cpp Changes: ===================================== xpfe/appshell/AppWindow.cpp ===================================== @@ -3018,6 +3018,9 @@ void AppWindow::FullscreenChanged(bool aInFullscreen) { void AppWindow::FinishFullscreenChange(bool aInFullscreen) { mFullscreenChangeState = FullscreenChangeState::NotChanging; + if (nsXULPopupManager* pm = nsXULPopupManager::GetInstance()) { + pm->Rollup({}); + } if (mDocShell) { if (nsCOMPtr<nsPIDOMWindowOuter> ourWindow = mDocShell->GetWindow()) { ourWindow->FinishFullscreenChange(aInFullscreen); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/89e409e… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/89e409e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-115.11.0esr-13.0-1] Bug 1828259 - Close XUL popup when entering/exiting fullscreen; r=smaug
by ma1 (＠ma1) 10 Jun '24

10 Jun '24

ma1 pushed to branch tor-browser-115.11.0esr-13.0-1 at The Tor Project / Applications / Tor Browser Commits: 8fc6e0c6 by Edgar Chen at 2024-06-10T20:15:15+02:00 Bug 1828259 - Close XUL popup when entering/exiting fullscreen; r=smaug Differential Revision: https://phabricator.services.mozilla.com/D209355 - - - - - 1 changed file: - xpfe/appshell/AppWindow.cpp Changes: ===================================== xpfe/appshell/AppWindow.cpp ===================================== @@ -3018,6 +3018,9 @@ void AppWindow::FullscreenChanged(bool aInFullscreen) { void AppWindow::FinishFullscreenChange(bool aInFullscreen) { mFullscreenChangeState = FullscreenChangeState::NotChanging; + if (nsXULPopupManager* pm = nsXULPopupManager::GetInstance()) { + pm->Rollup({}); + } if (mDocShell) { if (nsCOMPtr<nsPIDOMWindowOuter> ourWindow = mDocShell->GetWindow()) { ourWindow->FinishFullscreenChange(aInFullscreen); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8fc6e0c… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/8fc6e0c… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/firefox-android][firefox-android-115.2.1-13.5-1] fixup! Modify add-on support
by Pier Angelo Vendrame (＠pierov) 10 Jun '24

10 Jun '24

Pier Angelo Vendrame pushed to branch firefox-android-115.2.1-13.5-1 at The Tor Project / Applications / firefox-android Commits: 9020793e by Pier Angelo Vendrame at 2024-06-10T16:02:49+02:00 fixup! Modify add-on support Bug 42619: Remove our custom AddonCollectionProvider. Our own custom list of allowed addons will get outdate very soon, breaking the installation of addons from AMO, and maybe preventing the update of the ones already installed. However, the AMO collection might not be available until the boostrap is done in some conditions (when it has never been cached, or if the cache expired) and in these cases the installed addons will not be displayed either. - - - - - 3 changed files: - − fenix/app/src/main/assets/allowed_addons.json - fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt - − fenix/app/src/main/java/org/mozilla/fenix/components/TorAddonCollectionProvider.kt Changes: ===================================== fenix/app/src/main/assets/allowed_addons.json deleted ===================================== The diff for this file was not included because it is too large. ===================================== fenix/app/src/main/java/org/mozilla/fenix/components/Components.kt ===================================== @@ -12,6 +12,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.core.app.NotificationManagerCompat import com.google.android.play.core.review.ReviewManagerFactory import mozilla.components.feature.addons.AddonManager +import mozilla.components.feature.addons.amo.AddonCollectionProvider import mozilla.components.feature.addons.migration.DefaultSupportedAddonsChecker import mozilla.components.feature.addons.update.DefaultAddonUpdater import mozilla.components.feature.autofill.AutofillConfiguration @@ -113,7 +114,32 @@ class Components(private val context: Context) { } val addonCollectionProvider by lazyMonitored { - TorAddonCollectionProvider(context, core.client) + // Check if we have a customized (overridden) AMO collection (supported in Nightly & Beta) + if (FeatureFlags.customExtensionCollectionFeature && context.settings().amoCollectionOverrideConfigured()) { + AddonCollectionProvider( + context, + core.client, + collectionUser = context.settings().overrideAmoUser, + collectionName = context.settings().overrideAmoCollection, + ) + } + // Use build config otherwise + else if (!BuildConfig.AMO_COLLECTION_USER.isNullOrEmpty() && + !BuildConfig.AMO_COLLECTION_NAME.isNullOrEmpty() + ) { + AddonCollectionProvider( + context, + core.client, + serverURL = BuildConfig.AMO_SERVER_URL, + collectionUser = BuildConfig.AMO_COLLECTION_USER, + collectionName = BuildConfig.AMO_COLLECTION_NAME, + maxCacheAgeInMinutes = AMO_COLLECTION_MAX_CACHE_AGE, + ) + } + // Fall back to defaults + else { + AddonCollectionProvider(context, core.client, maxCacheAgeInMinutes = AMO_COLLECTION_MAX_CACHE_AGE) + } } @Suppress("MagicNumber") ===================================== fenix/app/src/main/java/org/mozilla/fenix/components/TorAddonCollectionProvider.kt deleted ===================================== @@ -1,64 +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/. */ - -// Copyright (c) 2020, The Tor Project, Inc. - -package org.mozilla.fenix.components - -import android.content.Context -import android.graphics.Bitmap -import kotlinx.coroutines.withContext -import mozilla.components.concept.fetch.Client -import mozilla.components.feature.addons.Addon -import kotlinx.coroutines.Dispatchers -import mozilla.components.feature.addons.amo.AddonCollectionProvider -import java.io.IOException - -internal const val COLLECTION_NAME = "tor_browser_collection" -internal const val ALLOWED_ADDONS_PATH = "allowed_addons.json" -internal const val MAX_CACHE_AGE = 1000L * 365L * 24L * 60L // 1000 years - -class TorAddonCollectionProvider( - private val context: Context, - client: Client -) : AddonCollectionProvider( - context, client, serverURL = "", - collectionName = COLLECTION_NAME, - maxCacheAgeInMinutes = MAX_CACHE_AGE -) { - private var isCacheLoaded = false - - @Throws(IOException::class) - override suspend fun getAvailableAddons( - allowCache: Boolean, - readTimeoutInSeconds: Long?, - language: String? - ): List<Addon> { - ensureCache(language) - return super.getAvailableAddons(true, readTimeoutInSeconds, language) - } - - @Throws(IOException::class) - override suspend fun getAddonIconBitmap(addon: Addon): Bitmap? { - // super.getAddonIconBitmap does not look at the cache, so calling - // ensureCache here is not helpful. In addition, now the cache depends - // on a language, and that isn't available right now. - // ensureCache(language) - return super.getAddonIconBitmap(addon) - } - - @Throws(IOException::class) - private suspend fun ensureCache(language: String?) { - if (isCacheLoaded) { - return - } - return withContext(Dispatchers.IO) { - val data = context.assets.open(ALLOWED_ADDONS_PATH).bufferedReader().use { - it.readText() - } - writeToDiskCache(data, language) - isCacheLoaded = true - } - } -} View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/902… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/firefox-android/-/commit/902… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][main] Bug 41161: Explicitly fetch tags in the relprep script.
by richard (＠richard) 10 Jun '24

10 Jun '24

richard pushed to branch main at The Tor Project / Applications / tor-browser-build Commits: eb369108 by Pier Angelo Vendrame at 2024-06-10T09:18:42+02:00 Bug 41161: Explicitly fetch tags in the relprep script. This should make sure the script always bumps the build number in rbm.conf if needed. - - - - - 1 changed file: - tools/relprep.py Changes: ===================================== tools/relprep.py ===================================== @@ -158,6 +158,7 @@ class ReleasePreparation: if remote is None: raise RuntimeError("Cannot find the tpo/applications remote.") remote.fetch() + remote.fetch(tags=True) branch_name = ( "main" if self.version.is_alpha else f"maint-{self.version.major}" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/e… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag mb-13.5a9-build2
by Pier Angelo Vendrame (＠pierov) 10 Jun '24

10 Jun '24

Pier Angelo Vendrame pushed new tag mb-13.5a9-build2 at The Tor Project / Applications / tor-browser-build -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/mb-… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build] Pushed new tag tbb-13.5a9-build2
by Pier Angelo Vendrame (＠pierov) 10 Jun '24

10 Jun '24

Pier Angelo Vendrame pushed new tag tbb-13.5a9-build2 at The Tor Project / Applications / tor-browser-build -- This project does not include diff previews in email notifications. View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/tree/tbb… You're receiving this email because of your account on gitlab.torproject.org.

1 0