September 2024 - tbb-commits - lists.torproject.org

[Git][tpo/applications/mullvad-browser] Pushed new tag mullvad-browser-128.2.0esr-14.0-1-build2
by morgan (＠morgan) 06 Sep '24

06 Sep '24

morgan pushed new tag mullvad-browser-128.2.0esr-14.0-1-build2 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/tor-browser] Pushed new tag tor-browser-128.2.0esr-14.0-1-build3
by morgan (＠morgan) 06 Sep '24

06 Sep '24

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

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! [android] Add Tor integration and UI
by morgan (＠morgan) 05 Sep '24

05 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 13947ad8 by clairehurst at 2024-09-05T14:41:54-06:00 fixup! [android] Add Tor integration and UI Bug_42655: Implement "New circuit for this site" on Android - - - - - 6 changed files: - mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt - + mobile/android/fenix/app/src/main/res/drawable/new_circuit.xml - mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== mobile/android/android-components/components/browser/engine-gecko/src/main/java/mozilla/components/browser/engine/gecko/GeckoEngineSession.kt ===================================== @@ -1808,6 +1808,10 @@ class GeckoEngineSession( geckoSession.translationsSessionDelegate = GeckoTranslateSessionDelegate(this) } + fun newTorCircuit() { + geckoSession.newTorCircuit() + } + companion object { internal const val PROGRESS_START = 25 internal const val PROGRESS_STOP = 100 ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/BrowserToolbarMenuController.kt ===================================== @@ -16,6 +16,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.MainScope import kotlinx.coroutines.launch import mozilla.appservices.places.BookmarkRoot +import mozilla.components.browser.engine.gecko.GeckoEngineSession import mozilla.components.browser.state.action.EngineAction import mozilla.components.browser.state.ext.getUrl import mozilla.components.browser.state.selector.findCustomTabOrSelectedTab @@ -430,6 +431,13 @@ class DefaultBrowserToolbarMenuController( BrowserFragmentDirections.actionBrowserFragmentToTranslationsDialogFragment() navController.navigateSafe(R.id.browserFragment, directions) } + + ToolbarMenu.Item.NewTorCircuit -> { + currentSession?.let { + sessionUseCases.reload.invoke(it.id) + (it.engineState.engineSession as GeckoEngineSession).newTorCircuit() + } + } } } @@ -513,6 +521,10 @@ class DefaultBrowserToolbarMenuController( "translate", ), ) + + ToolbarMenu.Item.NewTorCircuit -> { + /* Tor doesn't use telemetry and therefore this doesn't need to be implemented */ + } } } ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/DefaultToolbarMenu.kt ===================================== @@ -16,7 +16,6 @@ import kotlinx.coroutines.flow.distinctUntilChangedBy import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.launch import mozilla.components.browser.menu.BrowserMenuHighlight -import mozilla.components.browser.menu.BrowserMenuItem import mozilla.components.browser.menu.WebExtensionBrowserMenuBuilder import mozilla.components.browser.menu.item.BrowserMenuDivider import mozilla.components.browser.menu.item.BrowserMenuHighlightableItem @@ -32,7 +31,6 @@ import mozilla.components.browser.state.state.TabSessionState import mozilla.components.browser.state.store.BrowserStore import mozilla.components.concept.storage.BookmarksStorage import mozilla.components.feature.top.sites.PinnedSiteStorage -import mozilla.components.feature.webcompat.reporter.WebCompatReporterFeature import mozilla.components.lib.state.ext.flowScoped import mozilla.components.support.ktx.android.content.getColorFromAttr import mozilla.components.support.ktx.kotlinx.coroutines.flow.ifAnyChanged @@ -211,6 +209,14 @@ open class DefaultToolbarMenu( onItemTapped.invoke(ToolbarMenu.Item.NewTab) } + private val newCircuitItem = BrowserMenuImageText( + context.getString(R.string.library_new_circuit), + R.drawable.new_circuit, + primaryTextColor(), + ) { + onItemTapped.invoke(ToolbarMenu.Item.NewTorCircuit) + } + //private val historyItem = BrowserMenuImageText( // context.getString(R.string.library_history), // R.drawable.ic_history, @@ -409,6 +415,8 @@ open class DefaultToolbarMenu( if (shouldUseBottomToolbar || !shouldShowMenuToolbar) null else menuToolbar, newTabItem, BrowserMenuDivider(), + newCircuitItem, + BrowserMenuDivider(), bookmarksItem, //historyItem, downloadsItem, ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/toolbar/ToolbarMenu.kt ===================================== @@ -55,6 +55,7 @@ interface ToolbarMenu { object Passwords : Item() object Downloads : Item() object NewTab : Item() + object NewTorCircuit : Item() } val menuBuilder: BrowserMenuBuilder ===================================== mobile/android/fenix/app/src/main/res/drawable/new_circuit.xml ===================================== @@ -0,0 +1,7 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="16dp" android:viewportHeight="16" android:viewportWidth="16" android:width="16dp"> + + <path android:fillColor="#5B5B66" android:fillType="evenOdd" android:pathData="M10.599,2.897C9.522,2.349 8.298,2.155 7.104,2.344C6.642,2.417 6.195,2.546 5.769,2.726C5.822,2.91 5.85,3.105 5.85,3.307C5.85,4.48 4.898,5.432 3.725,5.432C2.551,5.432 1.6,4.48 1.6,3.307C1.6,2.133 2.551,1.182 3.725,1.182C4.238,1.182 4.708,1.363 5.075,1.666C5.654,1.399 6.271,1.21 6.908,1.109C8.363,0.879 9.854,1.115 11.167,1.784C12.479,2.452 13.547,3.52 14.216,4.832C14.885,6.145 15.121,7.635 14.891,9.09C14.837,9.431 14.517,9.664 14.176,9.61C13.835,9.556 13.602,9.236 13.656,8.895C13.845,7.701 13.651,6.477 13.102,5.4C12.553,4.322 11.677,3.446 10.599,2.897ZM4.65,3.307C4.65,3.818 4.235,4.232 3.725,4.232C3.214,4.232 2.8,3.818 2.8,3.307C2.8,2.796 3.214,2.382 3.725,2.382C4.235,2.382 4.65,2.796 4.65,3.307Z"/> + + <path android:fillColor="#5B5B66" android:fillType="evenOdd" android:pathData="M1.824,6.39C2.165,6.444 2.398,6.764 2.344,7.105C2.155,8.299 2.349,9.523 2.898,10.6C3.447,11.678 4.323,12.554 5.401,13.103C6.478,13.651 7.702,13.845 8.896,13.656C9.356,13.583 9.803,13.455 10.227,13.276C10.173,13.088 10.144,12.891 10.144,12.686C10.144,11.512 11.096,10.561 12.269,10.561C13.443,10.561 14.394,11.512 14.394,12.686C14.394,13.86 13.443,14.811 12.269,14.811C11.76,14.811 11.293,14.632 10.927,14.333C10.347,14.601 9.73,14.79 9.092,14.891C7.637,15.121 6.146,14.885 4.833,14.216C3.52,13.548 2.453,12.481 1.784,11.168C1.115,9.855 0.879,8.365 1.109,6.91C1.163,6.569 1.483,6.336 1.824,6.39ZM13.194,12.686C13.194,13.197 12.78,13.611 12.269,13.611C11.759,13.611 11.344,13.197 11.344,12.686C11.344,12.175 11.759,11.761 12.269,11.761C12.78,11.761 13.194,12.175 13.194,12.686Z"/> + +</vector> ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -31,6 +31,8 @@ <string name="tor_explore_privately">Explore. Privately.</string> + <string name="library_new_circuit">New circuit</string> + <string name="preferences_tor_connection_settings_title">Connection</string> <string name="preferences_tor_network_settings">Tor Network</string> <string name="preferences_tor_network_settings_explanation">Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world.</string> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/13947ad… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/13947ad… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] 2 commits: fixup! Lox integration
by Pier Angelo Vendrame (＠pierov) 05 Sep '24

05 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 7d601745 by Pier Angelo Vendrame at 2024-09-05T20:03:33+02:00 fixup! Lox integration Bug 42607 (part): Do not ship the Lox wasm blob on Android. - - - - - e56124b4 by Pier Angelo Vendrame at 2024-09-05T20:03:40+02:00 fixup! Bug 40597: Implement TorSettings module Bug 42607 (part): Do not try to enable Lox on Android. Lox is not on Android, yet (not even in alpha), so we removed its WASM blob to make x86 build fit the play store requirements. However, this causes an error message in the console, which we do not need to show because it is completely expected. - - - - - 2 changed files: - toolkit/components/lox/jar.mn - toolkit/modules/TorSettings.sys.mjs Changes: ===================================== toolkit/components/lox/jar.mn ===================================== @@ -1,2 +1,4 @@ toolkit.jar: +#ifndef ANDROID content/global/lox/lox_wasm_bg.wasm (content/lox_wasm_bg.wasm) +#endif ===================================== toolkit/modules/TorSettings.sys.mjs ===================================== @@ -696,10 +696,12 @@ class TorSettingsImpl { // Initialize this before loading from prefs because we need Lox initialized // before any calls to Lox.getBridges(). - try { - await lazy.Lox.init(); - } catch (e) { - lazy.logger.error("Could not initialize Lox.", e); + if (!lazy.TorLauncherUtil.isAndroid) { + try { + await lazy.Lox.init(); + } catch (e) { + lazy.logger.error("Could not initialize Lox.", e); + } } if ( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7c54df… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/7c54df… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! Bug 40185: [android] Use NimbusDisabled
by Pier Angelo Vendrame (＠pierov) 05 Sep '24

05 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 7c54df4a by Dan Ballard at 2024-09-05T17:58:05+00:00 fixup! Bug 40185: [android] Use NimbusDisabled Bug 43016: Redisable Nimbus - - - - - 5 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Analytics.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/NimbusComponents.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/SaveToPDFMiddleware.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/HomeActivity.kt ===================================== @@ -378,7 +378,7 @@ open class HomeActivity : LocaleAwareAppCompatActivity(), NavHostActivity, TorIn ?.also { Events.appOpened.record(Events.AppOpenedExtra(it)) // This will record an event in Nimbus' internal event store. Used for behavioral targeting - components.nimbus.events.recordEvent("app_opened") + // components.nimbus.events.recordEvent("app_opened") if (safeIntent.action.equals(ACTION_OPEN_PRIVATE_TAB) && it == APP_ICON) { AppIcon.newPrivateTabTapped.record(NoExtras()) ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/Analytics.kt ===================================== @@ -17,8 +17,6 @@ import mozilla.components.lib.crash.service.MozillaSocorroService import mozilla.components.support.ktx.android.content.isMainProcess import mozilla.components.support.utils.BrowsersCache import mozilla.components.support.utils.RunWhenReadyQueue -import mozilla.components.service.nimbus.NimbusDisabled -import org.mozilla.fenix.nimbus.FxNimbus import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.Config import org.mozilla.fenix.HomeActivity ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/BackgroundServices.kt ===================================== @@ -254,7 +254,7 @@ internal class TelemetryAccountObserver( // User signed-in into an existing FxA account. AuthType.Signin -> { SyncAuth.signIn.record(NoExtras()) - context.components.nimbus.events.recordEvent("sync_auth.sign_in") + // context.components.nimbus.events.recordEvent("sync_auth.sign_in") } // User created a new FxA account. ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/components/NimbusComponents.kt ===================================== @@ -6,16 +6,21 @@ package org.mozilla.fenix.components import android.content.Context import mozilla.components.service.nimbus.NimbusApi +import mozilla.components.service.nimbus.NimbusDisabled import mozilla.components.service.nimbus.messaging.FxNimbusMessaging +import mozilla.components.service.nimbus.messaging.Message +import mozilla.components.service.nimbus.messaging.MessageMetadataStorage import mozilla.components.service.nimbus.messaging.NimbusMessagingController import mozilla.components.service.nimbus.messaging.NimbusMessagingControllerInterface import mozilla.components.service.nimbus.messaging.NimbusMessagingStorage import mozilla.components.service.nimbus.messaging.OnDiskMessageMetadataStorage import org.mozilla.experiments.nimbus.NimbusEventStore import org.mozilla.experiments.nimbus.NimbusMessagingHelperInterface +import org.mozilla.experiments.nimbus.NullNimbus import org.mozilla.fenix.BuildConfig import org.mozilla.fenix.experiments.createNimbus import org.mozilla.fenix.messaging.CustomAttributeProvider +import org.mozilla.fenix.nimbus.FxNimbus import org.mozilla.fenix.perf.lazyMonitored /** @@ -28,7 +33,14 @@ class NimbusComponents(private val context: Context) { * should be mediated through a FML generated class, e.g. [FxNimbus]. */ val sdk: NimbusApi by lazyMonitored { - createNimbus(context, BuildConfig.NIMBUS_ENDPOINT) + if (BuildConfig.DATA_COLLECTION_DISABLED) { + NimbusDisabled(context) + } else { + createNimbus(context, BuildConfig.NIMBUS_ENDPOINT).also { api -> + FxNimbus.api = api + } + } + } /** @@ -44,7 +56,8 @@ class NimbusComponents(private val context: Context) { * the JEXL helper available from [createJexlHelper]. */ val events: NimbusEventStore by lazyMonitored { - sdk.events + NullNimbus(context) + //sdk.events } /** @@ -92,10 +105,25 @@ class NimbusComponents(private val context: Context) { private val messagingStorage by lazyMonitored { NimbusMessagingStorage( context = context, - metadataStorage = OnDiskMessageMetadataStorage(context), + metadataStorage = NullMessageMetadataStorage(), //OnDiskMessageMetadataStorage(context), nimbus = sdk, messagingFeature = FxNimbusMessaging.features.messaging, attributeProvider = CustomAttributeProvider, ) } } +// Noop impl of MessageMetadataStorage to replace OnDiskMessageMetadataStorage +class NullMessageMetadataStorage(): MessageMetadataStorage { + override suspend fun getMetadata(): Map<String, Message.Metadata> { + var metadataMap: MutableMap<String, Message.Metadata> = hashMapOf() + return metadataMap + } + + override suspend fun addMetadata(metadata: Message.Metadata): Message.Metadata { + return metadata + } + + override suspend fun updateMetadata(metadata: Message.Metadata) { + // noop + } +} ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/share/SaveToPDFMiddleware.kt ===================================== @@ -154,7 +154,7 @@ class SaveToPDFMiddleware( source = telemetrySource(isPdf), ), ) - nimbusEventStore.recordEvent("print_tapped") + // nimbusEventStore.recordEvent("print_tapped") } else { Events.saveToPdfTapped.record( Events.SaveToPdfTappedExtra( View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7c54df4… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7c54df4… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! [android] Delete unused media
by Pier Angelo Vendrame (＠pierov) 05 Sep '24

05 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 50ad336a by clairehurst at 2024-09-05T15:42:55+00:00 fixup! [android] Delete unused media - - - - - 3 changed files: - mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt - mobile/android/fenix/app/src/test/java/org/mozilla/fenix/share/viewholders/AppViewHolderTest.kt Changes: ===================================== mobile/android/fenix/app/src/androidTest/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt ===================================== @@ -359,7 +359,7 @@ val privacyCaption: Caption = mockk(relaxed = true) private val defaultBrowserPageUiDataWithPrivacyCaption = OnboardingPageUiData( type = OnboardingPageUiData.Type.DEFAULT_BROWSER, - imageRes = R.drawable.ic_onboarding_welcome, + imageRes = R.drawable.mozac_lib_crash_notification, title = "default browser title", description = "default browser body", primaryButtonLabel = "default browser primary button text", @@ -368,7 +368,7 @@ private val defaultBrowserPageUiDataWithPrivacyCaption = OnboardingPageUiData( ) private val addSearchWidgetPageUiData = OnboardingPageUiData( type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET, - imageRes = R.drawable.ic_onboarding_search_widget, + imageRes = R.drawable.mozac_lib_crash_notification, title = "add search widget title", description = "add search widget body", primaryButtonLabel = "add search widget primary button text", @@ -377,7 +377,7 @@ private val addSearchWidgetPageUiData = OnboardingPageUiData( ) private val addSearchWidgetPageUiDataWithPrivacyCaption = OnboardingPageUiData( type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET, - imageRes = R.drawable.ic_onboarding_search_widget, + imageRes = R.drawable.mozac_lib_crash_notification, title = "add search widget title", description = "add search widget body", primaryButtonLabel = "add search widget primary button text", @@ -386,7 +386,7 @@ private val addSearchWidgetPageUiDataWithPrivacyCaption = OnboardingPageUiData( ) private val syncPageUiData = OnboardingPageUiData( type = OnboardingPageUiData.Type.SYNC_SIGN_IN, - imageRes = R.drawable.ic_onboarding_sync, + imageRes = R.drawable.mozac_lib_crash_notification, title = "sync title", description = "sync body", primaryButtonLabel = "sync primary button text", @@ -395,7 +395,7 @@ private val syncPageUiData = OnboardingPageUiData( ) private val syncPageUiDataWithPrivacyCaption = OnboardingPageUiData( type = OnboardingPageUiData.Type.SYNC_SIGN_IN, - imageRes = R.drawable.ic_onboarding_sync, + imageRes = R.drawable.mozac_lib_crash_notification, title = "sync title", description = "sync body", primaryButtonLabel = "sync primary button text", @@ -404,7 +404,7 @@ private val syncPageUiDataWithPrivacyCaption = OnboardingPageUiData( ) private val notificationPageUiData = OnboardingPageUiData( type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION, - imageRes = R.drawable.ic_notification_permission, + imageRes = R.drawable.mozac_lib_crash_notification, title = "notification title", description = "notification body", primaryButtonLabel = "notification primary button text", @@ -414,7 +414,7 @@ private val notificationPageUiData = OnboardingPageUiData( private val defaultBrowserCardData = OnboardingCardData( cardType = OnboardingCardType.DEFAULT_BROWSER, - imageRes = R.drawable.ic_onboarding_welcome, + imageRes = R.drawable.mozac_lib_crash_notification, title = StringHolder(null, "default browser title"), body = StringHolder(null, "default browser body"), primaryButtonLabel = StringHolder(null, "default browser primary button text"), @@ -426,7 +426,7 @@ private val defaultBrowserCardData = OnboardingCardData( private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData( cardType = OnboardingCardType.DEFAULT_BROWSER, - imageRes = R.drawable.ic_onboarding_welcome, + imageRes = R.drawable.mozac_lib_crash_notification, title = StringHolder(null, "default browser title"), body = StringHolder(null, "default browser body"), primaryButtonLabel = StringHolder(null, "default browser primary button text"), @@ -438,7 +438,7 @@ private val defaultBrowserCardDataNoDisqualifiers = OnboardingCardData( private val addSearchWidgetCardDataNoConditions = OnboardingCardData( cardType = OnboardingCardType.ADD_SEARCH_WIDGET, - imageRes = R.drawable.ic_onboarding_search_widget, + imageRes = R.drawable.mozac_lib_crash_notification, title = StringHolder(null, "add search widget title"), body = StringHolder(null, "add search widget body"), primaryButtonLabel = StringHolder(null, "add search widget primary button text"), @@ -450,7 +450,7 @@ private val addSearchWidgetCardDataNoConditions = OnboardingCardData( private val addSearchWidgetCardData = OnboardingCardData( cardType = OnboardingCardType.ADD_SEARCH_WIDGET, - imageRes = R.drawable.ic_onboarding_search_widget, + imageRes = R.drawable.mozac_lib_crash_notification, title = StringHolder(null, "add search widget title"), body = StringHolder(null, "add search widget body"), primaryButtonLabel = StringHolder(null, "add search widget primary button text"), @@ -460,7 +460,7 @@ private val addSearchWidgetCardData = OnboardingCardData( private val syncCardData = OnboardingCardData( cardType = OnboardingCardType.SYNC_SIGN_IN, - imageRes = R.drawable.ic_onboarding_sync, + imageRes = R.drawable.mozac_lib_crash_notification, title = StringHolder(null, "sync title"), body = StringHolder(null, "sync body"), primaryButtonLabel = StringHolder(null, "sync primary button text"), @@ -472,7 +472,7 @@ private val syncCardData = OnboardingCardData( private val notificationCardData = OnboardingCardData( cardType = OnboardingCardType.NOTIFICATION_PERMISSION, - imageRes = R.drawable.ic_notification_permission, + imageRes = R.drawable.mozac_lib_crash_notification, title = StringHolder(null, "notification title"), body = StringHolder(null, "notification body"), primaryButtonLabel = StringHolder(null, "notification primary button text"), ===================================== mobile/android/fenix/app/src/test/java/org/mozilla/fenix/onboarding/view/OnboardingMapperTest.kt ===================================== @@ -13,7 +13,7 @@ class OnboardingMapperTest { @Test fun `GIVEN a default browser page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() { val expected = OnboardingPageState( - imageRes = R.drawable.ic_onboarding_welcome, + imageRes = R.drawable.mozac_lib_crash_notification, title = "default browser title", description = "default browser body with link text", primaryButton = Action("default browser primary button text", unitLambda), @@ -22,7 +22,7 @@ class OnboardingMapperTest { val onboardingPageUiData = OnboardingPageUiData( type = OnboardingPageUiData.Type.DEFAULT_BROWSER, - imageRes = R.drawable.ic_onboarding_welcome, + imageRes = R.drawable.mozac_lib_crash_notification, title = "default browser title", description = "default browser body with link text", primaryButtonLabel = "default browser primary button text", @@ -47,7 +47,7 @@ class OnboardingMapperTest { @Test fun `GIVEN a sync page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() { val expected = OnboardingPageState( - imageRes = R.drawable.ic_onboarding_sync, + imageRes = R.drawable.mozac_lib_crash_notification, title = "sync title", description = "sync body", primaryButton = Action("sync primary button text", unitLambda), @@ -56,7 +56,7 @@ class OnboardingMapperTest { val onboardingPageUiData = OnboardingPageUiData( type = OnboardingPageUiData.Type.SYNC_SIGN_IN, - imageRes = R.drawable.ic_onboarding_sync, + imageRes = R.drawable.mozac_lib_crash_notification, title = "sync title", description = "sync body", primaryButtonLabel = "sync primary button text", @@ -81,7 +81,7 @@ class OnboardingMapperTest { @Test fun `GIVEN a notification page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() { val expected = OnboardingPageState( - imageRes = R.drawable.ic_notification_permission, + imageRes = R.drawable.mozac_lib_crash_notification, title = "notification title", description = "notification body", primaryButton = Action("notification primary button text", unitLambda), @@ -90,7 +90,7 @@ class OnboardingMapperTest { val onboardingPageUiData = OnboardingPageUiData( type = OnboardingPageUiData.Type.NOTIFICATION_PERMISSION, - imageRes = R.drawable.ic_notification_permission, + imageRes = R.drawable.mozac_lib_crash_notification, title = "notification title", description = "notification body", primaryButtonLabel = "notification primary button text", @@ -115,7 +115,7 @@ class OnboardingMapperTest { @Test fun `GIVEN an add search widget page WHEN mapToOnboardingPageState is called THEN creates the expected OnboardingPageState`() { val expected = OnboardingPageState( - imageRes = R.drawable.ic_onboarding_search_widget, + imageRes = R.drawable.mozac_lib_crash_notification, title = "add search widget title", description = "add search widget body with link text", primaryButton = Action("add search widget primary button text", unitLambda), @@ -124,7 +124,7 @@ class OnboardingMapperTest { val onboardingPageUiData = OnboardingPageUiData( type = OnboardingPageUiData.Type.ADD_SEARCH_WIDGET, - imageRes = R.drawable.ic_onboarding_search_widget, + imageRes = R.drawable.mozac_lib_crash_notification, title = "add search widget title", description = "add search widget body with link text", primaryButtonLabel = "add search widget primary button text", ===================================== mobile/android/fenix/app/src/test/java/org/mozilla/fenix/share/viewholders/AppViewHolderTest.kt ===================================== @@ -39,7 +39,7 @@ class AppViewHolderTest { fun `bind app share option`() { val app = AppShareOption( name = "Pocket", - icon = getDrawable(testContext, R.drawable.ic_pocket)!!, + icon = getDrawable(testContext, R.drawable.mozac_lib_crash_notification)!!, packageName = "com.mozilla.pocket", activityName = "MainActivity", ) @@ -53,7 +53,7 @@ class AppViewHolderTest { fun `trigger interactor if application is bound`() { val app = AppShareOption( name = "Pocket", - icon = getDrawable(testContext, R.drawable.ic_pocket)!!, + icon = getDrawable(testContext, R.drawable.mozac_lib_crash_notification)!!, packageName = "com.mozilla.pocket", activityName = "MainActivity", ) View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/50ad336… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/50ad336… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-128.2.0esr-14.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 05 Sep '24

05 Sep '24

Pier Angelo Vendrame pushed to branch mullvad-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Mullvad Browser Commits: 5c72998b by Morgan at 2024-09-05T17:28:19+02:00 fixup! Firefox preference overrides. Bug 42640: Disable Firefox Flame buttond due to unknown interactions with New Identity - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -23,6 +23,11 @@ pref("browser.tabs.firefox-view", false, locked); // Disable 'Switching to a new device" help menu item (tor-browser#41774) pref("browser.device-migration.help-menu.hidden", true); +#if MOZ_UPDATE_CHANNEL == release +// tor-browser#42640: Disable Firefox Flame buttond due to unknown interactions with New Identity +pref("browser.privatebrowsing.resetPBM.enabled", false, locked); +#endif + // Bug 41668: allow users to apply updates. This is set also in firefox.js for // all platforms, except for Windows. As explained on firefox.js, Firefox uses a // per-installation preference on Windows. However, we patch this behavior, and View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/5c7… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/5c7… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][base-browser-128.2.0esr-14.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 05 Sep '24

05 Sep '24

Pier Angelo Vendrame pushed to branch base-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: efd38795 by Morgan at 2024-09-05T17:27:58+02:00 fixup! Firefox preference overrides. Bug 42640: Disable Firefox Flame buttond due to unknown interactions with New Identity - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -23,6 +23,11 @@ pref("browser.tabs.firefox-view", false, locked); // Disable 'Switching to a new device" help menu item (tor-browser#41774) pref("browser.device-migration.help-menu.hidden", true); +#if MOZ_UPDATE_CHANNEL == release +// tor-browser#42640: Disable Firefox Flame buttond due to unknown interactions with New Identity +pref("browser.privatebrowsing.resetPBM.enabled", false, locked); +#endif + // Bug 41668: allow users to apply updates. This is set also in firefox.js for // all platforms, except for Windows. As explained on firefox.js, Firefox uses a // per-installation preference on Windows. However, we patch this behavior, and View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/efd3879… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/efd3879… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser][tor-browser-128.2.0esr-14.0-1] fixup! Firefox preference overrides.
by Pier Angelo Vendrame (＠pierov) 05 Sep '24

05 Sep '24

Pier Angelo Vendrame pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: 0d2ad09a by Morgan at 2024-09-05T15:26:24+00:00 fixup! Firefox preference overrides. Bug 42640: Disable Firefox Flame buttond due to unknown interactions with New Identity - - - - - 1 changed file: - browser/app/profile/001-base-profile.js Changes: ===================================== browser/app/profile/001-base-profile.js ===================================== @@ -23,6 +23,11 @@ pref("browser.tabs.firefox-view", false, locked); // Disable 'Switching to a new device" help menu item (tor-browser#41774) pref("browser.device-migration.help-menu.hidden", true); +#if MOZ_UPDATE_CHANNEL == release +// tor-browser#42640: Disable Firefox Flame buttond due to unknown interactions with New Identity +pref("browser.privatebrowsing.resetPBM.enabled", false, locked); +#endif + // Bug 41668: allow users to apply updates. This is set also in firefox.js for // all platforms, except for Windows. As explained on firefox.js, Firefox uses a // per-installation preference on Windows. However, we patch this behavior, and View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0d2ad09… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/0d2ad09… You're receiving this email because of your account on gitlab.torproject.org.

1 0

[Git][tpo/applications/tor-browser-build][maint-13.5] Bug 41229: Migrate OpenSSL download location to github releases
by Pier Angelo Vendrame (＠pierov) 05 Sep '24

05 Sep '24

Pier Angelo Vendrame pushed to branch maint-13.5 at The Tor Project / Applications / tor-browser-build Commits: 061a2d3c by Morgan at 2024-09-05T15:23:24+02:00 Bug 41229: Migrate OpenSSL download location to github releases - - - - - 2 changed files: - projects/openssl/config - tools/relprep.py Changes: ===================================== projects/openssl/config ===================================== @@ -35,6 +35,6 @@ input_files: - project: container-image - name: '[% c("var/compiler") %]' project: '[% c("var/compiler") %]' - - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz' + - URL: 'https://github.com/openssl/openssl/releases/download/openssl-[% c("version") %]/openssl-[% c("version") %].tar.gz' sha256sum: eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca name: openssl ===================================== tools/relprep.py ===================================== @@ -403,7 +403,7 @@ class ReleasePreparation: source = self.find_input(config, "openssl") # No need to update URL, as it uses a variable. hash_url = ( - f"https://www.openssl.org/source/openssl-{version}.tar.gz.sha256" + f"https://github.com/openssl/openssl/releases/download/openssl-{version}/open…" ) r = requests.get(hash_url) r.raise_for_status() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/0… You're receiving this email because of your account on gitlab.torproject.org.

1 0