diff options
Diffstat (limited to 'android/app/src')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt index 8bba8fc437..37aa06a7c9 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/ConnectViewModel.kt @@ -65,7 +65,13 @@ class ConnectViewModel(private val serviceConnectionManager: ServiceConnectionMa tunnelRealState, isTunnelInfoExpanded -> ConnectUiState( - location = location, + location = + when (tunnelRealState) { + is TunnelState.Connected -> tunnelRealState.location + is TunnelState.Connecting -> tunnelRealState.location + else -> null + } + ?: location, relayLocation = relayLocation, versionInfo = versionInfo, tunnelUiState = tunnelUiState, @@ -83,7 +89,7 @@ class ConnectViewModel(private val serviceConnectionManager: ServiceConnectionMa is TunnelState.Disconnected -> true is TunnelState.Disconnecting -> { when (tunnelUiState.actionAfterDisconnect) { - ActionAfterDisconnect.Nothing -> true + ActionAfterDisconnect.Nothing -> false ActionAfterDisconnect.Block -> true ActionAfterDisconnect.Reconnect -> false } |