- tbb-commits - lists.torproject.org

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

10 Jun '26

Pier Angelo Vendrame pushed new branch tor-browser-140.12.0esr-15.0-1 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. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/mullvad-browser] Pushed new tag FIREFOX_140_12_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 10 Jun '26

10 Jun '26

Pier Angelo Vendrame pushed new tag FIREFOX_140_12_0esr_BUILD1 at The Tor Project / Applications / Mullvad Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/tree/FIREF… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser] Pushed new tag FIREFOX_140_12_0esr_BUILD1
by Pier Angelo Vendrame (＠pierov) 10 Jun '26

10 Jun '26

Pier Angelo Vendrame pushed new tag FIREFOX_140_12_0esr_BUILD1 at The Tor Project / Applications / Tor Browser -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/tree/FIREFOX_1… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/mullvad-browser][mullvad-browser-152.0a1-16.0-2] fixup! BB 44711: Hide unwanted setting controls in Base Browser.
by henry (＠henry) 09 Jun '26

09 Jun '26

henry pushed to branch mullvad-browser-152.0a1-16.0-2 at The Tor Project / Applications / Mullvad Browser Commits: cba29173 by Henry Wilkes at 2026-06-09T17:03:07+01:00 fixup! BB 44711: Hide unwanted setting controls in Base Browser. BB 45043: Re-add missing changes to settings after 152 rebase. Drop changes to "addresses" and "payments" since these now properly hidden without the formautofill extension being in the build. - - - - - 3 changed files: - browser/components/preferences/config/passwords-autofill.mjs - browser/components/preferences/config/privacy.mjs - browser/components/preferences/privacy.js Changes: ===================================== browser/components/preferences/config/passwords-autofill.mjs ===================================== @@ -757,9 +757,6 @@ SettingGroupManager.registerGroups({ ], }, managePayments: { - // Hide the payments settings. tor-browser#44460. - hidden: true, - hiddenFromSearch: true, items: [ { id: "add-payment-button", @@ -776,9 +773,6 @@ SettingGroupManager.registerGroups({ ], }, manageAddresses: { - // Hide the addresses settings. tor-browser#44460. - hidden: true, - hiddenFromSearch: true, items: [ { id: "add-address-button", ===================================== browser/components/preferences/config/privacy.mjs ===================================== @@ -2226,6 +2226,13 @@ Preferences.addSetting({ id: "relayIntegration", deps: ["savePasswords", "relayFeature"], visible: () => { + // Hide Firefox Relay. tor-browser#43109 and tor-browser#42814. + // NOTE: Whilst `FirefoxRelay.isDisabled` is `true` due to preferences we + // set for Base Browser, `FirefoxRelay.isAvailable` is also `true` in this + // case, hence why we still need to hide this unconditionally. + if (lazy.AppConstants.BASE_BROWSER_VERSION) { + return false; + } return lazy.FirefoxRelay.isAvailable; }, disabled: ({ savePasswords, relayFeature }) => { @@ -3498,6 +3505,8 @@ Preferences.addSetting({ Preferences.addSetting({ id: "etpStatusBoxGroup", + // Hide enhanced tracking protection (ETP). tor-browser#26345. + visible: () => false, }); Preferences.addSetting({ @@ -3530,6 +3539,8 @@ Preferences.addSetting({ Preferences.addSetting({ id: "protectionsDashboardLink", + // Hide enhanced tracking protection (ETP). tor-browser#26345. + visible: () => false, }); Preferences.addSetting({ ===================================== browser/components/preferences/privacy.js ===================================== @@ -640,12 +640,6 @@ var gPrivacyPane = { initSettingGroup("cookiesAndSiteData2"); initSettingGroup("certificates"); initSettingGroup("ipprotection"); - // NOTE: "managePayments" and "manageAddresses" are usually initialised by - // FormAutofillPreferences.sys.mjs via FormAutofillStatus. But this never - // runs because the "autofill" extension is excluded from the build. So we - // initialise them ourselves with an empty config. See tor-browser#44630. - initSettingGroup("managePayments"); - initSettingGroup("manageAddresses"); initSettingGroup("history"); initSettingGroup("history2"); initSettingGroup("permissions"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/cba… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/mullvad-browser/-/commit/cba… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] fixup! BB 44711: Hide unwanted setting controls in Base Browser.
by henry (＠henry) 09 Jun '26

09 Jun '26

henry pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 81c2b390 by Henry Wilkes at 2026-06-09T16:01:33+00:00 fixup! BB 44711: Hide unwanted setting controls in Base Browser. BB 45043: Re-add missing changes to settings after 152 rebase. Drop changes to "addresses" and "payments" since these now properly hidden without the formautofill extension being in the build. - - - - - 3 changed files: - browser/components/preferences/config/passwords-autofill.mjs - browser/components/preferences/config/privacy.mjs - browser/components/preferences/privacy.js Changes: ===================================== browser/components/preferences/config/passwords-autofill.mjs ===================================== @@ -778,9 +778,6 @@ SettingGroupManager.registerGroups({ ], }, managePayments: { - // Hide the payments settings. tor-browser#44460. - hidden: true, - hiddenFromSearch: true, items: [ { id: "add-payment-button", @@ -797,9 +794,6 @@ SettingGroupManager.registerGroups({ ], }, manageAddresses: { - // Hide the addresses settings. tor-browser#44460. - hidden: true, - hiddenFromSearch: true, items: [ { id: "add-address-button", ===================================== browser/components/preferences/config/privacy.mjs ===================================== @@ -2226,6 +2226,13 @@ Preferences.addSetting({ id: "relayIntegration", deps: ["savePasswords", "relayFeature"], visible: () => { + // Hide Firefox Relay. tor-browser#43109 and tor-browser#42814. + // NOTE: Whilst `FirefoxRelay.isDisabled` is `true` due to preferences we + // set for Base Browser, `FirefoxRelay.isAvailable` is also `true` in this + // case, hence why we still need to hide this unconditionally. + if (lazy.AppConstants.BASE_BROWSER_VERSION) { + return false; + } return lazy.FirefoxRelay.isAvailable; }, disabled: ({ savePasswords, relayFeature }) => { @@ -3496,6 +3503,8 @@ Preferences.addSetting({ Preferences.addSetting({ id: "etpStatusBoxGroup", + // Hide enhanced tracking protection (ETP). tor-browser#26345. + visible: () => false, }); Preferences.addSetting({ @@ -3528,6 +3537,8 @@ Preferences.addSetting({ Preferences.addSetting({ id: "protectionsDashboardLink", + // Hide enhanced tracking protection (ETP). tor-browser#26345. + visible: () => false, }); Preferences.addSetting({ ===================================== browser/components/preferences/privacy.js ===================================== @@ -641,12 +641,6 @@ var gPrivacyPane = { initSettingGroup("onionSiteAuthentication"); initSettingGroup("certificates"); initSettingGroup("ipprotection"); - // NOTE: "managePayments" and "manageAddresses" are usually initialised by - // FormAutofillPreferences.sys.mjs via FormAutofillStatus. But this never - // runs because the "autofill" extension is excluded from the build. So we - // initialise them ourselves with an empty config. See tor-browser#44630. - initSettingGroup("managePayments"); - initSettingGroup("manageAddresses"); initSettingGroup("history"); initSettingGroup("history2"); initSettingGroup("permissions"); View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/81c2b39… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/81c2b39… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] fixup! BB 42758: Fix WebRTC build errors.
by Pier Angelo Vendrame (＠pierov) 09 Jun '26

09 Jun '26

Pier Angelo Vendrame pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: acdf6230 by Pier Angelo Vendrame at 2026-06-09T15:18:50+02:00 fixup! BB 42758: Fix WebRTC build errors. MB 552: Fix WebRTC on mingw after the 152 rebase. - - - - - 1 changed file: - third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc Changes: ===================================== third_party/libwebrtc/modules/desktop_capture/win/wgc_capture_session.cc ===================================== @@ -193,8 +193,7 @@ bool WgcCaptureSession::MayContainCursor() const { // IsCursorCaptureEnabled was introduced in IGraphicsCaptureSession2. // Default to true (cursor captured) if the interface is not available. ComPtr<ABI::Windows::Graphics::Capture::IGraphicsCaptureSession2> session2; - HRESULT hr = session_->QueryInterface( - ABI::Windows::Graphics::Capture::IID_IGraphicsCaptureSession2, &session2); + HRESULT hr = session_->QueryInterface(IID_PPV_ARGS(&session2)); if (FAILED(hr)) { return true; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/acdf623… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/acdf623… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] 2 commits: fixup! TB 30237: Add v3 onion services client authentication prompt
by morgan (＠morgan) 09 Jun '26

09 Jun '26

morgan pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: f861b51e by Henry Wilkes at 2026-06-09T12:46:49+00:00 fixup! TB 30237: Add v3 onion services client authentication prompt TB 44888: Use button opacity CSS variable. - - - - - 5f27d879 by Henry Wilkes at 2026-06-09T12:46:49+00:00 fixup! TB 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection TB 44888: Use button opacity CSS variable. - - - - - 2 changed files: - browser/components/onionservices/content/authPreferences.css - browser/components/torpreferences/content/torPreferences.css Changes: ===================================== browser/components/onionservices/content/authPreferences.css ===================================== @@ -30,8 +30,7 @@ * TODO: Replace with moz-button when it handles this for us. See * tor-browser#43275. */ button.spoof-button-disabled { - /* Borrow the :disabled rule from common-shared.css */ - opacity: 0.4; + opacity: var(--button-opacity-disabled); /* Also ensure it does not get hover or active styling. */ pointer-events: none; } ===================================== browser/components/torpreferences/content/torPreferences.css ===================================== @@ -9,8 +9,7 @@ * TODO: Replace with moz-button when it handles this for us. See * tor-browser#43275. */ button.spoof-button-disabled { - /* Borrow the :disabled rule from common-shared.css */ - opacity: 0.4; + opacity: var(--button-opacity-disabled); /* Also ensure it does not get hover or active styling. */ pointer-events: none; } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/068ab2… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/068ab2… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] fixup! [android] Disable features and functionality
by Dan Ballard (＠dan) 08 Jun '26

08 Jun '26

Dan Ballard pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 068ab2f5 by clairehurst at 2026-06-08T16:54:02-06:00 fixup! [android] Disable features and functionality Bug 44769: Remove crash screen - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/startupCrash/StartupCrashScreen.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/startupCrash/StartupCrashScreen.kt ===================================== @@ -53,15 +53,13 @@ internal fun StartupCrashScreen(store: StartupCrashStore) { verticalArrangement = Arrangement.Center, horizontalAlignment = Alignment.CenterHorizontally, ) { - ScreenImg() - - Spacer(modifier = Modifier.height(16.dp)) ScreenText() Spacer(modifier = Modifier.height(24.dp)) - when (state.uiState) { + // tb#44769 Force state.uiState to be UiState.Finished because we don't want to report crashes + when (UiState.Finished) { UiState.Idle -> { ReportButtons(store) } @@ -153,16 +151,6 @@ private fun ScreenText() { ), style = FirefoxTheme.typography.headline5, ) - - Text( - text = stringResource( - R.string.startup_crash_body, - stringResource(R.string.firefox), - ), - color = MaterialTheme.colorScheme.onSurfaceVariant, - style = FirefoxTheme.typography.body2, - textAlign = TextAlign.Center, - ) } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/068ab2f… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/068ab2f… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] fixup! TB 40026 [android]: Implement Security Level settings on Android.
by Dan Ballard (＠dan) 08 Jun '26

08 Jun '26

Dan Ballard pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: ab12da36 by clairehurst at 2026-06-08T16:41:03-06:00 fixup! TB 40026 [android]: Implement Security Level settings on Android. - - - - - 1 changed file: - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevelFragment.kt Changes: ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorSecurityLevelFragment.kt ===================================== @@ -125,8 +125,7 @@ class TorSecurityLevelFragment : Fragment(), SystemInsetsPaddedFragment { R.color.settings_button_white, ) binding.cancelButton.setOnClickListener { - @Suppress("DEPRECATION") - requireActivity().onBackPressed() + requireActivity().onBackPressedDispatcher.onBackPressed() } } View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ab12da3… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/ab12da3… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0

[Git][tpo/applications/tor-browser][tor-browser-152.0a1-16.0-2] 2 commits: fixup! [android] Implement Android-native Connection Assist UI
by Dan Ballard (＠dan) 08 Jun '26

08 Jun '26

Dan Ballard pushed to branch tor-browser-152.0a1-16.0-2 at The Tor Project / Applications / Tor Browser Commits: 5eb5f5ef by clairehurst at 2026-06-08T15:31:58-07:00 fixup! [android] Implement Android-native Connection Assist UI Bug 43576: Connection Assist on Android Fast Follows (Bug 41188) Add frequent regions UI - - - - - 21e669d3 by clairehurst at 2026-06-08T15:31:58-07:00 [android] TBA strings Bug 43576: Connection Assist on Android Fast Follows (Bug 41188) Add frequent regions UI - - - - - 5 changed files: - + mobile/android/android-components/components/ui/icons/src/main/res/drawable/unthemed_dropdown_arrow.xml - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt - mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt - mobile/android/fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml - mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml Changes: ===================================== mobile/android/android-components/components/ui/icons/src/main/res/drawable/unthemed_dropdown_arrow.xml ===================================== @@ -0,0 +1,5 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp"> + + <path android:fillColor="#FBFBFE" android:pathData="M7,10L12,15L17,10H7Z"/> + +</vector> ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt ===================================== @@ -4,7 +4,6 @@ package org.mozilla.fenix.tor -import android.content.Intent import android.graphics.Color import android.graphics.Typeface import android.os.Build @@ -18,9 +17,40 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.AdapterView -import android.widget.ArrayAdapter import androidx.appcompat.content.res.AppCompatResources +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.material3.DividerDefaults +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.HorizontalDivider +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi +import androidx.compose.material3.adaptive.currentWindowDpSize +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.ViewCompositionStrategy +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.DpOffset +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.core.view.isEmpty import androidx.fragment.app.Fragment import androidx.fragment.app.activityViewModels @@ -29,8 +59,10 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle import androidx.navigation.fragment.findNavController +import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.launch import mozilla.components.support.base.feature.UserInteractionHandler +import mozilla.components.ui.colors.PhotonColors import mozilla.components.ui.colors.R as colorsR import org.mozilla.fenix.HomeActivity import org.mozilla.fenix.R @@ -48,7 +80,9 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler, SystemIn private var _binding: FragmentTorConnectionAssistBinding? = null private val binding get() = _binding!! - private lateinit var regionDropDownSpinnerAdapter: ArrayAdapter<String> + private val firstMenuItem: MutableStateFlow<String> by lazy { + MutableStateFlow(getString(R.string.connection_assist_automatic_country_detection)) + } override fun onCreateView( inflater: LayoutInflater, @@ -210,95 +244,186 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler, SystemIn private fun updateRegionDropdown(screen: ConnectAssistUiState) { if (screen.regionDropDownVisible) { - if (binding.countryDropDown.isEmpty()) { - regionDropDownSpinnerAdapter = initializeSpinner() + firstMenuItem.value = getString(screen.regionDropDownDefaultItem) + if (binding.regionDropDown.isEmpty()) { + binding.regionDropDown.apply { + setContent { + setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed) + RegionDropDown() + } + } torConnectionAssistViewModel.fetchFrequentRegions() torConnectionAssistViewModel.fetchRegionNames() } - setFirstItemInCountryDropDown(getString(screen.regionDropDownDefaultItem)) - if (screen == ConnectAssistUiState.ChooseRegion || screen == ConnectAssistUiState.ConfirmRegion || screen == ConnectAssistUiState.RegionNotFound) { torConnectionAssistViewModel.selectDefaultRegion() - setDropDownSelectionToSelectedCountryCode() } - binding.unblockTheInternetInCountryDescription.visibility = View.VISIBLE - binding.countryDropDown.visibility = View.VISIBLE + binding.regionDropDown.visibility = View.VISIBLE } else { - binding.unblockTheInternetInCountryDescription.visibility = View.GONE - binding.countryDropDown.visibility = View.GONE + binding.regionDropDown.visibility = View.GONE } } - private fun setDropDownSelectionToSelectedCountryCode() { - binding.countryDropDown.setSelection( - indexOfSelectedCountryCode(), - ) - } - - private fun indexOfSelectedCountryCode() : Int { - return torConnectionAssistViewModel.regionCodeNameMap.value?.keys?.indexOf( - torConnectionAssistViewModel.selectedCountryCode.value, - )?.plus(1) ?: 0 - } - - private fun setFirstItemInCountryDropDown(item: String) { - if (!regionDropDownSpinnerAdapter.isEmpty) { - regionDropDownSpinnerAdapter.remove(regionDropDownSpinnerAdapter.getItem(0)) - } - regionDropDownSpinnerAdapter.insert(item, 0) - } - - private fun initializeSpinner(): ArrayAdapter<String> { - val spinnerAdapter: ArrayAdapter<String> = - ArrayAdapter<String>( - requireContext(), - android.R.layout.simple_spinner_item, - android.R.id.text1, - ) - spinnerAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) - binding.countryDropDown.adapter = spinnerAdapter - binding.countryDropDown.onItemSelectedListener = - object : AdapterView.OnItemSelectedListener { - override fun onItemSelected( - parent: AdapterView<*>?, - view: View?, - position: Int, - id: Long, - ) { - torConnectionAssistViewModel.setCountryCodeToSelectedItem(position) - updateButton1(torConnectionAssistViewModel.torConnectScreen.value) - } - - override fun onNothingSelected(parent: AdapterView<*>?) {} - } - - viewLifecycleOwner.lifecycleScope.launch { - repeatOnLifecycle(Lifecycle.State.STARTED) { - torConnectionAssistViewModel.regionCodeNameMap.collect { - if (it != null) { - spinnerAdapter.clear() - spinnerAdapter.add(getString(torConnectionAssistViewModel.torConnectScreen.value.regionDropDownDefaultItem)) - spinnerAdapter.addAll(it.values) + @Composable + fun RegionDropDown( + textStyle: TextStyle = TextStyle( + fontSize = 16.sp, + lineHeight = 24.sp, + fontWeight = FontWeight(400), + color = PhotonColors.LightGrey05, + letterSpacing = 0.15.sp, + ), + labelTextStyle: TextStyle = TextStyle( + fontSize = 14.sp, + lineHeight = 20.sp, + fontWeight = FontWeight(400), + color = PhotonColors.LightGrey40, + letterSpacing = 0.25.sp, + ), + ) { + var expanded by rememberSaveable { mutableStateOf(false) } + Box( + modifier = Modifier.fillMaxWidth() + ) { + TextButton( + onClick = { expanded = !expanded }, + modifier = Modifier + .fillMaxWidth() + .padding(horizontal = 16.dp), + ) { + Column { + Text( + getString(R.string.connection_assist_unblock_the_internet_in_country_or_region), + color = PhotonColors.LightGrey05, + modifier = Modifier.padding(bottom = 8.dp), + fontSize = 14.sp, + ) + Row { + Text( + torConnectionAssistViewModel.regionCodeNameMap.collectAsState().value?.get( + torConnectionAssistViewModel.selectedCountryCode.collectAsState().value, + ) ?: firstMenuItem.collectAsState().value, + color = PhotonColors.LightGrey05, + fontSize = 14.sp, + ) + Spacer(modifier = Modifier.weight(1f)) + Image( + painterResource(mozilla.components.ui.icons.R.drawable.unthemed_dropdown_arrow), + contentDescription = null, + ) } + HorizontalDivider(Modifier, thickness = 1.dp, color = PhotonColors.LightGrey05) } } - } - - viewLifecycleOwner.lifecycleScope.launch { - repeatOnLifecycle(Lifecycle.State.STARTED) { - torConnectionAssistViewModel.frequentRegionCodes.collect { - if (it != null) { - for (region in it) { - Log.d(TAG, "collected region: $region") + DropdownMenu( + expanded = expanded, + onDismissRequest = { expanded = false }, + offset = DpOffset(x = 24.dp, y = 0.dp), + modifier = Modifier.background(color = PhotonColors.Violet90) + ) { + @OptIn(ExperimentalMaterial3AdaptiveApi::class) + LazyColumn( + Modifier + .width(250.dp) + .height(currentWindowDpSize().height) // fixMaxHeight() doesn't work, use this instead + ) { + item { + RegionDropdownMenuItem( + "automatic", + firstMenuItem.collectAsState().value, + dismissAction = { expanded = false }, + textStyle = textStyle, + ) + } + if (torConnectionAssistViewModel.frequentRegionCodes.value?.isEmpty() == false) { + item { + HorizontalDivider(Modifier, DividerDefaults.Thickness, color = PhotonColors.Ink05) + DropdownMenuItem( + text = { + Text( + text = getString(R.string.connection_assist_frequently_selected_locations), + style = labelTextStyle, + ) + }, + onClick = {}, + ) + } + viewLifecycleOwner.lifecycleScope.launch { + repeatOnLifecycle(Lifecycle.State.STARTED) { + torConnectionAssistViewModel.frequentRegionCodes.collect { codes -> + if (codes != null) { + for (code in codes) { + item { + RegionDropdownMenuItem( + code, + torConnectionAssistViewModel.regionCodeNameMap.collectAsState().value?.get( + code, + ), + dismissAction = { expanded = false }, + textStyle = textStyle, + ) + } + } + } + } + } + } + item { + HorizontalDivider(Modifier, DividerDefaults.Thickness, color = PhotonColors.Ink05) + DropdownMenuItem( + text = { + Text( + text = getString(R.string.connection_assist_other_locations), + style = labelTextStyle, + ) + }, + onClick = {} + ) + } + } + viewLifecycleOwner.lifecycleScope.launch { + repeatOnLifecycle(Lifecycle.State.STARTED) { + torConnectionAssistViewModel.regionCodeNameMap.collect { regions -> + if (regions != null) { + for (region in regions.toList()) { + item { + RegionDropdownMenuItem( + region.first, region.second, + dismissAction = { expanded = false }, + textStyle = textStyle, + ) + } + } + } + } + } } } - } } } + } - return spinnerAdapter + @Composable + fun RegionDropdownMenuItem( + key: String, + text: String?, + dismissAction: () -> Unit, + textStyle: TextStyle, + ) { + DropdownMenuItem( + modifier = Modifier.padding(start = 8.dp), + text = { Text( + text ?: return@DropdownMenuItem, + style = textStyle, + ) }, + onClick = { + torConnectionAssistViewModel.selectedCountryCode.value = key + updateButton1(torConnectionAssistViewModel.torConnectScreen.value) + dismissAction() + }, + ) } private fun setButton1(screen: ConnectAssistUiState) { ===================================== mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt ===================================== @@ -116,14 +116,6 @@ class TorConnectionAssistViewModel( selectedCountryCode.value = torConnectStage.value?.defaultRegion ?: "automatic" } - fun setCountryCodeToSelectedItem(position: Int) { - selectedCountryCode.value = - regionCodeNameMap.value?.keys?.toList() - ?.getOrNull(position - 1) ?: "automatic" - // position - 1 since we have the default/first value of automatic - Log.d(TAG, "selectedCountryCode = ${selectedCountryCode.value}") - } - val shouldOpenHome: MutableLiveData<Boolean> by lazy { MutableLiveData(false) } ===================================== mobile/android/fenix/app/src/main/res/layout/fragment_tor_connection_assist.xml ===================================== @@ -109,30 +109,14 @@ android:textColor="@color/photonLightGrey05" app:layout_constraintTop_toBottomOf="@id/title_description" /> - <TextView - android:id="@+id/unblock_the_internet_in_country_description" + <androidx.compose.ui.platform.ComposeView + android:id="@+id/regionDropDown" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingHorizontal="24dp" - android:layout_marginTop="24dp" - android:text="@string/connection_assist_unblock_the_internet_in_country_or_region" - android:textColor="@color/photonLightGrey05" - android:visibility="gone" - app:layout_constraintTop_toBottomOf="@id/title_description" /> - - <androidx.appcompat.widget.AppCompatSpinner - android:id="@+id/country_drop_down" - style="@style/Widget.AppCompat.Spinner.Underlined" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="24dp" - android:layout_marginTop="8dp" - android:layout_marginEnd="24dp" - android:textColor="@color/photonLightGrey05" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/unblock_the_internet_in_country_description" /> + app:layout_constraintTop_toBottomOf="@id/quickstart_switch" /> <ImageView android:id="@+id/wordmarkLogo" ===================================== mobile/android/fenix/app/src/main/res/values/torbrowser_strings.xml ===================================== @@ -91,6 +91,10 @@  <string name="connection_assist_select_country_or_region">Select country or region</string>  + <string name="connection_assist_frequently_selected_locations">Frequently selected locations</string> +  + <string name="connection_assist_other_locations">Other locations</string> +  <string name="connection_assist_try_a_bridge_button">Try a bridge</string>  <string name="connection_assist_trying_a_bridge_title">Trying a bridge…</string> View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/bfdbea… -- View it on GitLab: https://gitlab.torproject.org/tpo/applications/tor-browser/-/compare/bfdbea… You're receiving this email because of your account on gitlab.torproject.org. Manage all notifications: https://gitlab.torproject.org/-/profile/notifications | Help: https://gitlab.torproject.org/help

1 0