1 files changed, 4 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt
index 917cbf37c9..d746f8e8e4 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt
@@ -29,6 +29,7 @@ class WireguardKeyFragment : Fragment() {
     private var currentJob: Job? = null
     private var updateViewsJob: Job? = null
     private var tunnelStateListener: Int? = null
+    private var tunnelState: TunnelState = TunnelState.Disconnected()
     private lateinit var parentActivity: MainActivity
     private lateinit var connectionProxy: ConnectionProxy
     private lateinit var keyStatusListener: KeyStatusListener
@@ -164,7 +165,7 @@ class WireguardKeyFragment : Fragment() {
     }
 
     private fun drawNoConnectionState() {
-        when (connectionProxy.state) {
+        when (tunnelState) {
             is TunnelState.Connecting, is TunnelState.Disconnecting -> {
                 statusMessage.setText(R.string.wireguard_key_connectivity)
                 statusMessage.visibility = View.VISIBLE
@@ -221,7 +222,8 @@ class WireguardKeyFragment : Fragment() {
     override fun onResume() {
         super.onResume()
 
-        tunnelStateListener = connectionProxy.onUiStateChange.subscribe { _ ->
+        tunnelStateListener = connectionProxy.onUiStateChange.subscribe { uiState ->
+            tunnelState = uiState
             updateViewsJob?.cancel()
             updateViewsJob = updateViewJob()
         }