Move setter side effects to the event listener

1 files changed, 2 insertions, 2 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
index 2bb50567c9..93bb9e5ecf 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
@@ -32,9 +32,7 @@ class ConnectionProxy(val context: Context, val daemon: MullvadDaemon) {
     var state = initialState
         private set(value) {
             field = value
-            resetAnticipatedStateJob?.cancel()
             onStateChange.notify(value)
-            uiState = value
         }
 
     var uiState = initialState
@@ -46,7 +44,9 @@ class ConnectionProxy(val context: Context, val daemon: MullvadDaemon) {
     init {
         daemon.onTunnelStateChange = { newState ->
             synchronized(this) {
+                resetAnticipatedStateJob?.cancel()
                 state = newState
+                uiState = newState
             }
         }
     }