- tbb-commits - lists.torproject.org

[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

[Git][tpo/applications/tor-browser-build][main] 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 main at The Tor Project / Applications / tor-browser-build Commits: cbdf0359 by Morgan at 2024-09-05T04:04:21+00: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 ===================================== @@ -374,7 +374,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/c… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser-build/-/commit/c… 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] Disable features and functionality
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: a1b5c671 by clairehurst at 2024-09-05T12:23:07+00:00 fixup! [android] Disable features and functionality - - - - - 3 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt - mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/search/SearchEngineFragment.kt ===================================== @@ -34,15 +34,15 @@ class SearchEngineFragment : PreferenceFragmentCompat() { rootKey, ) - requirePreference<SwitchPreference>(R.string.pref_key_show_sponsored_suggestions).apply { - isVisible = context.settings().enableFxSuggest - } - requirePreference<SwitchPreference>(R.string.pref_key_show_nonsponsored_suggestions).apply { - isVisible = context.settings().enableFxSuggest - } - requirePreference<Preference>(R.string.pref_key_learn_about_fx_suggest).apply { - isVisible = context.settings().enableFxSuggest - } +// requirePreference<SwitchPreference>(R.string.pref_key_show_sponsored_suggestions).apply { +// isVisible = context.settings().enableFxSuggest +// } +// requirePreference<SwitchPreference>(R.string.pref_key_show_nonsponsored_suggestions).apply { +// isVisible = context.settings().enableFxSuggest +// } +// requirePreference<Preference>(R.string.pref_key_learn_about_fx_suggest).apply { +// isVisible = context.settings().enableFxSuggest +// } view?.hideKeyboard() } @@ -83,10 +83,10 @@ class SearchEngineFragment : PreferenceFragmentCompat() { isChecked = context.settings().shouldShowBookmarkSuggestions } - val showSyncedTabsSuggestions = - requirePreference<SwitchPreference>(R.string.pref_key_search_synced_tabs).apply { - isChecked = context.settings().shouldShowSyncedTabsSuggestions - } +// val showSyncedTabsSuggestions = +// requirePreference<SwitchPreference>(R.string.pref_key_search_synced_tabs).apply { +// isChecked = context.settings().shouldShowSyncedTabsSuggestions +// } val showClipboardSuggestions = requirePreference<SwitchPreference>(R.string.pref_key_show_clipboard_suggestions).apply { @@ -98,28 +98,28 @@ class SearchEngineFragment : PreferenceFragmentCompat() { isChecked = context.settings().shouldShowVoiceSearch } - val showSponsoredSuggestionsPreference = - requirePreference<SwitchPreference>(R.string.pref_key_show_sponsored_suggestions).apply { - isChecked = context.settings().showSponsoredSuggestions - summary = getString( - R.string.preferences_show_sponsored_suggestions_summary, - getString(R.string.app_name), - ) - } - - val showNonSponsoredSuggestionsPreference = - requirePreference<SwitchPreference>(R.string.pref_key_show_nonsponsored_suggestions).apply { - isChecked = context.settings().showNonSponsoredSuggestions - title = getString( - R.string.preferences_show_nonsponsored_suggestions, - getString(R.string.app_name), - ) - } +// val showSponsoredSuggestionsPreference = +// requirePreference<SwitchPreference>(R.string.pref_key_show_sponsored_suggestions).apply { +// isChecked = context.settings().showSponsoredSuggestions +// summary = getString( +// R.string.preferences_show_sponsored_suggestions_summary, +// getString(R.string.app_name), +// ) +// } +// +// val showNonSponsoredSuggestionsPreference = +// requirePreference<SwitchPreference>(R.string.pref_key_show_nonsponsored_suggestions).apply { +// isChecked = context.settings().showNonSponsoredSuggestions +// title = getString( +// R.string.preferences_show_nonsponsored_suggestions, +// getString(R.string.app_name), +// ) +// } searchSuggestionsPreference.onPreferenceChangeListener = SharedPreferenceUpdater() showHistorySuggestions.onPreferenceChangeListener = SharedPreferenceUpdater() showBookmarkSuggestions.onPreferenceChangeListener = SharedPreferenceUpdater() - showSyncedTabsSuggestions.onPreferenceChangeListener = SharedPreferenceUpdater() +// showSyncedTabsSuggestions.onPreferenceChangeListener = SharedPreferenceUpdater() showClipboardSuggestions.onPreferenceChangeListener = SharedPreferenceUpdater() searchSuggestionsInPrivatePreference.onPreferenceChangeListener = SharedPreferenceUpdater() showVoiceSearchPreference.onPreferenceChangeListener = object : Preference.OnPreferenceChangeListener { @@ -142,8 +142,8 @@ class SearchEngineFragment : PreferenceFragmentCompat() { true } - showSponsoredSuggestionsPreference.onPreferenceChangeListener = SharedPreferenceUpdater() - showNonSponsoredSuggestionsPreference.onPreferenceChangeListener = SharedPreferenceUpdater() +// showSponsoredSuggestionsPreference.onPreferenceChangeListener = SharedPreferenceUpdater() +// showNonSponsoredSuggestionsPreference.onPreferenceChangeListener = SharedPreferenceUpdater() } override fun onPreferenceTreeClick(preference: Preference): Boolean { ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -428,7 +428,7 @@ class Settings(private val appContext: Context) : PreferencesHolder { val shouldShowSyncedTabsSuggestions by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_search_synced_tabs), - default = true, + default = false, ) val shouldShowClipboardSuggestions by booleanPreference( @@ -2002,7 +2002,7 @@ class Settings(private val appContext: Context) : PreferencesHolder { */ var enableFxSuggest by lazyFeatureFlagPreference( key = appContext.getPreferenceKey(R.string.pref_key_enable_fxsuggest), - default = { FxNimbus.features.fxSuggest.value().enabled }, + default = { false }, // { FxNimbus.features.fxSuggest.value().enabled }, featureFlag = FeatureFlags.fxSuggest, ) ===================================== mobile/android/fenix/app/src/main/res/xml/search_settings_preferences.xml ===================================== @@ -39,52 +39,52 @@ app:iconSpaceReserved="false" /> </PreferenceCategory> + + + + + + + + + + + + + + + + + + + + + + + + + + <PreferenceCategory - android:title="@string/preference_search_address_bar_fx_suggest" + android:title="@string/preferences_settings_address_bar" android:selectable="false" app:iconSpaceReserved="false" android:layout="@layout/preference_category_no_icon_style"> - <SwitchPreference - app:iconSpaceReserved="false" - android:defaultValue="true" - android:key="@string/pref_key_search_browsing_history" - android:title='@string/preferences_search_browsing_history' /> <SwitchPreference app:iconSpaceReserved="false" android:defaultValue="true" - android:key="@string/pref_key_search_bookmarks" - android:title='@string/preferences_search_bookmarks' /> + android:key="@string/pref_key_show_clipboard_suggestions" + android:title="@string/preferences_show_clipboard_suggestions" /> <SwitchPreference app:iconSpaceReserved="false" android:defaultValue="true" - android:key="@string/pref_key_search_synced_tabs" - android:title='@string/preferences_search_synced_tabs' /> - <SwitchPreference - app:iconSpaceReserved="false" - android:key="@string/pref_key_show_nonsponsored_suggestions" - android:title="@string/preferences_show_nonsponsored_suggestions" - android:summary="@string/preferences_show_nonsponsored_suggestions_summary" /> - <SwitchPreference - app:iconSpaceReserved="false" - android:key="@string/pref_key_show_sponsored_suggestions" - android:title="@string/preferences_show_sponsored_suggestions" - android:summary="@string/preferences_show_sponsored_suggestions_summary" /> - <Preference - app:iconSpaceReserved="false" - android:key="@string/pref_key_learn_about_fx_suggest" - android:title="@string/preference_search_learn_about_fx_suggest" /> - </PreferenceCategory> - - <PreferenceCategory - android:title="@string/preferences_settings_address_bar" - android:selectable="false" - app:iconSpaceReserved="false" - android:layout="@layout/preference_category_no_icon_style"> + android:key="@string/pref_key_search_browsing_history" + android:title='@string/preferences_search_browsing_history' /> <SwitchPreference app:iconSpaceReserved="false" android:defaultValue="true" - android:key="@string/pref_key_show_clipboard_suggestions" - android:title="@string/preferences_show_clipboard_suggestions" /> + android:key="@string/pref_key_search_bookmarks" + android:title='@string/preferences_search_bookmarks' /> <SwitchPreference app:iconSpaceReserved="false" android:defaultValue="true" View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a1b5c67… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/a1b5c67… 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 40933: Add tor-launcher functionality
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: d9a1747d by Pier Angelo Vendrame at 2024-09-05T04:52:30+00:00 fixup! Bug 40933: Add tor-launcher functionality Bug 43116: Do not run GeoIP queries on Android. They are known for not working, since we are not shipping the GeoIP databases to save space. So, avoid spamming the console with warnings. - - - - - 1 changed file: - toolkit/components/tor-launcher/TorProvider.sys.mjs Changes: ===================================== toolkit/components/tor-launcher/TorProvider.sys.mjs ===================================== @@ -434,7 +434,9 @@ export class TorProvider { } else { node.ipAddrs = await this.#controller.getNodeAddresses(id); } - if (node.ipAddrs.length) { + // tor-browser#43116, tor-browser-build#41224: on Android, we do not ship + // the GeoIP databases to save some space. So skip it for now. + if (node.ipAddrs.length && !TorLauncherUtil.isAndroid) { // Get the country code for the node's IP address. try { // Expect a 2-letter ISO3166-1 code, which should also be a valid View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d9a1747… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/d9a1747… 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 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: 1b327909 by cypherpunks1 at 2024-09-04T18:35:18+00:00 fixup! Bug 40185: [android] Use NimbusDisabled Bug 43088: Re-enable query stripping for Android - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -698,10 +698,10 @@ class Settings(private val appContext: Context) : PreferencesHolder { get() = false // cookieBannersSection[CookieBannersSection.FEATURE_SETTING_GLOBAL_RULES_SUB_FRAMES] == 1 val shouldEnableQueryParameterStripping: Boolean - get() = false // queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING] == "1" + get() = true // queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING] == "1" val shouldEnableQueryParameterStrippingPrivateBrowsing: Boolean - get() = false // queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING_PMB] == "1" + get() = true // queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING_PMB] == "1" val queryParameterStrippingAllowList: String get() = "" // queryParameterStrippingSection[QUERY_PARAMETER_STRIPPING_ALLOW_LIST].orEmpty() View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1b32790… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/1b32790… 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] Disable features and functionality
by morgan (＠morgan) 04 Sep '24

04 Sep '24

morgan pushed to branch tor-browser-128.2.0esr-14.0-1 at The Tor Project / Applications / Tor Browser Commits: e406b050 by Dan Ballard at 2024-09-04T18:17:07+00:00 fixup! [android] Disable features and functionality Bug 43043: Remove credit card autofil ui elements from menu - - - - - 2 changed files: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/settings/SettingsFragment.kt ===================================== @@ -255,12 +255,12 @@ class SettingsFragment : PreferenceFragmentCompat() { requirePreference<Preference>(R.string.pref_key_tabs) tabSettingsPreference.summary = context?.settings()?.getTabTimeoutString() - val autofillPreference = requirePreference<Preference>(R.string.pref_key_credit_cards) - autofillPreference.title = if (settings.addressFeature) { - getString(R.string.preferences_autofill) - } else { - getString(R.string.preferences_credit_cards_2) - } +// val autofillPreference = requirePreference<Preference>(R.string.pref_key_credit_cards) +// autofillPreference.title = if (settings.addressFeature) { +// getString(R.string.preferences_autofill) +// } else { +// getString(R.string.preferences_credit_cards_2) +// } // val openLinksInAppsSettingsPreference = // requirePreference<Preference>(R.string.pref_key_open_links_in_apps) @@ -329,10 +329,10 @@ class SettingsFragment : PreferenceFragmentCompat() { SettingsFragmentDirections.actionSettingsFragmentToSavedLoginsAuthFragment() } - resources.getString(R.string.pref_key_credit_cards) -> { - SettingsMetrics.autofill.record() - SettingsFragmentDirections.actionSettingsFragmentToAutofillSettingFragment() - } +// resources.getString(R.string.pref_key_credit_cards) -> { +// SettingsMetrics.autofill.record() +// SettingsFragmentDirections.actionSettingsFragmentToAutofillSettingFragment() +// } resources.getString(R.string.pref_key_accessibility) -> { SettingsFragmentDirections.actionSettingsFragmentToAccessibilityFragment() ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/utils/Settings.kt ===================================== @@ -1657,7 +1657,7 @@ class Settings(private val appContext: Context) : PreferencesHolder { */ var shouldAutofillCreditCardDetails by booleanPreference( appContext.getPreferenceKey(R.string.pref_key_credit_cards_save_and_autofill_cards), - default = true, + default = BuildConfig.DATA_COLLECTION_DISABLED == false, ) /** View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e406b05… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/e406b05… You're receiving this email because of your account on gitlab.torproject.org.

1 0