clairehurst pushed to branch tor-browser-128.9.0esr-14.5-1 at The Tor Project / Applications / Tor Browser
Commits:
-
7c4f8015
by clairehurst at 2025-04-01T11:48:29-06:00
2 changed files:
- 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
Changes:
| ... | ... | @@ -290,7 +290,7 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler { |
| 290 | 290 | if (screen.torBootstrapButton1ShouldOpenSettings) {
|
| 291 | 291 | openTorConnectionSettings()
|
| 292 | 292 | } else {
|
| 293 | - torConnectionAssistViewModel.handleConnect()
|
|
| 293 | + torConnectionAssistViewModel.handleConnect(screen)
|
|
| 294 | 294 | }
|
| 295 | 295 | }
|
| 296 | 296 | updateButton1(screen)
|
| ... | ... | @@ -97,12 +97,12 @@ class TorConnectionAssistViewModel( |
| 97 | 97 | MutableLiveData(false)
|
| 98 | 98 | }
|
| 99 | 99 | |
| 100 | - fun handleConnect() {
|
|
| 101 | - val screen = _torConnectScreen.value
|
|
| 102 | - if (screen.torBootstrapButton1ShouldTryABridge && !button1ShouldBeDisabled(screen)) {
|
|
| 100 | + fun handleConnect(screen: ConnectAssistUiState) {
|
|
| 101 | + if (screen.torBootstrapButton1ShouldTryABridge) {
|
|
| 103 | 102 | Log.d(TAG, "beginAutoBootstrap with countryCode: ${selectedCountryCode.value}")
|
| 104 | 103 | torAndroidIntegration.beginAutoBootstrap(selectedCountryCode.value)
|
| 105 | 104 | } else {
|
| 105 | + Log.d(TAG, "beginBootstrap() on screen $screen")
|
|
| 106 | 106 | torAndroidIntegration.beginBootstrap()
|
| 107 | 107 | }
|
| 108 | 108 | }
|