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
fixup! [android] Implement Android-native Connection Assist UI
Bug 43576: Connection Assist on Android Fast Follows (Bug 41188)
cleanup use of _torConnectScreen.value: !1426 (comment 3176147)
- - - - -
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:
=====================================
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistFragment.kt
=====================================
@@ -290,7 +290,7 @@ class TorConnectionAssistFragment : Fragment(),
UserInteractionHandler {
if (screen.torBootstrapButton1ShouldOpenSettings) {
openTorConnectionSettings()
} else {
- torConnectionAssistViewModel.handleConnect()
+ torConnectionAssistViewModel.handleConnect(screen)
}
}
updateButton1(screen)
=====================================
mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorConnectionAssistViewModel.kt
=====================================
@@ -97,12 +97,12 @@ class TorConnectionAssistViewModel(
MutableLiveData(false)
}
- fun handleConnect() {
- val screen = _torConnectScreen.value
- if (screen.torBootstrapButton1ShouldTryABridge &&
!button1ShouldBeDisabled(screen)) {
+ fun handleConnect(screen: ConnectAssistUiState) {
+ if (screen.torBootstrapButton1ShouldTryABridge) {
Log.d(TAG, "beginAutoBootstrap with countryCode:
${selectedCountryCode.value}")
torAndroidIntegration.beginAutoBootstrap(selectedCountryCode.value)
} else {
+ Log.d(TAG, "beginBootstrap() on screen $screen")
torAndroidIntegration.beginBootstrap()
}
}
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7c4f801587f1ae9df5a280bdcbf7fbe26f3ce56b
--
View it on GitLab:
https://gitlab.torproject.org/tpo/applications/tor-browser/-/commit/7c4f801587f1ae9df5a280bdcbf7fbe26f3ce56b
You're receiving this email because of your account on gitlab.torproject.org.
_______________________________________________
tbb-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
