Handle set up and tear down in `ServiceConnection`

1 files changed, 13 insertions, 0 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt
index 7a6f93d2c3..831d52274f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt
@@ -32,7 +32,20 @@ class ServiceConnection(private val service: ServiceInstance, val mainActivity:
     init {
         asyncDaemon.complete(daemon)
         asyncConnectivityListener.complete(connectivityListener)
+        appVersionInfoCache.onCreate()
 
         connectionProxy.mainActivity = mainActivity
     }
+
+    fun onDestroy() {
+        asyncDaemon.cancel()
+        asyncConnectivityListener.cancel()
+
+        accountCache.onDestroy()
+        appVersionInfoCache.onDestroy()
+        keyStatusListener.onDestroy()
+        locationInfoCache.onDestroy()
+        relayListListener.onDestroy()
+        settingsListener.onDestroy()
+    }
 }