1 files changed, 10 insertions, 9 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
index 45dfb620a5..1e7f16e94d 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
@@ -90,12 +90,6 @@ class ConnectFragment : Fragment() {
         switchLocationButton.onClick = { openSwitchLocationScreen() }
 
         updateKeyStatusJob = updateKeyStatus(keyStatusListener.keyStatus)
-        updateTunnelStateJob = updateTunnelState(connectionProxy.uiState)
-
-        connectionProxy.onUiStateChange = { uiState ->
-            updateTunnelStateJob.cancel()
-            updateTunnelStateJob = updateTunnelState(uiState)
-        }
 
         return view
     }
@@ -119,6 +113,12 @@ class ConnectFragment : Fragment() {
         relayListListener.onRelayListChange = { relayList, selectedRelayItem ->
             switchLocationButton.location = selectedRelayItem
         }
+
+        updateTunnelStateJob = updateTunnelState(connectionProxy.uiState)
+        connectionProxy.onUiStateChange = { uiState ->
+            updateTunnelStateJob.cancel()
+            updateTunnelStateJob = updateTunnelState(uiState)
+        }
     }
 
     override fun onPause() {
@@ -126,6 +126,10 @@ class ConnectFragment : Fragment() {
         locationInfoCache.onNewLocation = null
         relayListListener.onRelayListChange = null
 
+        connectionProxy.onUiStateChange = null
+        updateTunnelStateJob.cancel()
+
+
         isTunnelInfoExpanded = locationInfo.isTunnelInfoExpanded
 
         notificationBanner.onPause()
@@ -136,9 +140,6 @@ class ConnectFragment : Fragment() {
     override fun onDestroyView() {
         switchLocationButton.onDestroy()
 
-        connectionProxy.onUiStateChange = null
-        updateTunnelStateJob.cancel()
-
         super.onDestroyView()
     }