Allow changing source of tunnel state events

2 files changed, 9 insertions, 7 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/LocationInfoCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/LocationInfoCache.kt
index cc325d3231..c0116e9ef7 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/LocationInfoCache.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/LocationInfoCache.kt
@@ -20,9 +20,9 @@ import net.mullvad.mullvadvpn.util.ExponentialBackoff
 import net.mullvad.mullvadvpn.util.Intermittent
 import net.mullvad.talpid.ConnectivityListener
 import net.mullvad.talpid.tunnel.ActionAfterDisconnect
+import net.mullvad.talpid.util.autoSubscribable
 
 class LocationInfoCache(
-    val connectionProxy: ConnectionProxy,
     val connectivityListener: ConnectivityListener,
     val daemon: Intermittent<MullvadDaemon>
 ) {
@@ -68,6 +68,10 @@ class LocationInfoCache(
         }
     }
 
+    var stateEvents by autoSubscribable<TunnelState>(this, TunnelState.Disconnected) { newState ->
+        state = newState
+    }
+
     var selectedRelay by observable<RelayItem?>(null) { _, oldRelay, newRelay ->
         if (newRelay != oldRelay) {
             updateSelectedRelayLocation(newRelay)
@@ -80,15 +84,11 @@ class LocationInfoCache(
                 fetchRequestChannel.sendBlocking(RequestFetch.ForRealLocation)
             }
         }
-
-        connectionProxy.onStateChange.subscribe(this) { realState ->
-            state = realState
-        }
     }
 
     fun onDestroy() {
         connectivityListener.connectivityNotifier.unsubscribe(this)
-        connectionProxy.onStateChange.unsubscribe(this)
+        stateEvents = null
         fetchRequestChannel.close()
 
         onNewLocation = null
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt
index f65cc3ecb2..3bd6e479fb 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt
@@ -19,7 +19,9 @@ class ServiceInstance(
     val keyStatusListener = KeyStatusListener(daemon)
 
     val locationInfoCache =
-        LocationInfoCache(connectionProxy, connectivityListener, intermittentDaemon)
+        LocationInfoCache(connectivityListener, intermittentDaemon).apply {
+            stateEvents = connectionProxy.onStateChange
+        }
 
     fun onDestroy() {
         accountCache.onDestroy()