Skip to content
Snippets Groups Projects
Commit 9a57f9f8 authored by clairehurst's avatar clairehurst Committed by Pier Angelo Vendrame
Browse files

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)
parent 556b87b2
No related branches found
No related tags found
1 merge request!1502TB 43415 (part 2): Cherry-picks from 128.9.0esr
......@@ -290,7 +290,7 @@ class TorConnectionAssistFragment : Fragment(), UserInteractionHandler {
if (screen.torBootstrapButton1ShouldOpenSettings) {
openTorConnectionSettings()
} else {
torConnectionAssistViewModel.handleConnect()
torConnectionAssistViewModel.handleConnect(screen)
}
}
updateButton1(screen)
......
......@@ -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()
}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment