Initialize notifiers before setters can use them

1 files changed, 4 insertions, 4 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 3f1efab066..2bb50567c9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ConnectionProxy.kt
@@ -25,6 +25,10 @@ class ConnectionProxy(val context: Context, val daemon: MullvadDaemon) {
     private val fetchInitialStateJob = fetchInitialState()
     private val initialState: TunnelState = TunnelState.Disconnected()
 
+    var onUiStateChange = EventNotifier(initialState)
+    var onStateChange = EventNotifier(initialState)
+    var vpnPermission = CompletableDeferred<Boolean>()
+
     var state = initialState
         private set(value) {
             field = value
@@ -39,10 +43,6 @@ class ConnectionProxy(val context: Context, val daemon: MullvadDaemon) {
             onUiStateChange.notify(value)
         }
 
-    var onUiStateChange = EventNotifier(uiState)
-    var onStateChange = EventNotifier(state)
-    var vpnPermission = CompletableDeferred<Boolean>()
-
     init {
         daemon.onTunnelStateChange = { newState ->
             synchronized(this) {