diff options
| author | Albin <albin@mullvad.net> | 2023-07-31 16:13:03 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-08-01 11:45:31 +0200 |
| commit | 1a2c21115d649687611a409fd724e0a0fa2aa48e (patch) | |
| tree | 8bded67f039c4dab1bf3fd6005f75773adde6b00 | |
| parent | 65340e0e391a6c8b9354a2904a4e30d0a442f24c (diff) | |
| download | mullvadvpn-1a2c21115d649687611a409fd724e0a0fa2aa48e.tar.xz mullvadvpn-1a2c21115d649687611a409fd724e0a0fa2aa48e.zip | |
Reduce location info flickering
| -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 } |