1 files changed, 4 insertions, 11 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 99a2edaa63..b698d86f9e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
@@ -29,17 +29,10 @@ class ConnectionProxy(val context: Context, val daemon: MullvadDaemon) {
     var onUiStateChange = EventNotifier(initialState)
     var vpnPermission = CompletableDeferred<Boolean>()
 
-    var state = initialState
-        private set(value) {
-            field = value
-            onStateChange.notify(value)
-        }
-
-    var uiState = initialState
-        private set(value) {
-            field = value
-            onUiStateChange.notify(value)
-        }
+    var state by onStateChange.notifiable()
+        private set
+    var uiState by onUiStateChange.notifiable()
+        private set
 
     init {
         daemon.onTunnelStateChange = { newState ->