1 files changed, 7 insertions, 0 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
index 2d129e3971..acfa68b502 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
@@ -36,6 +36,8 @@ class MainActivity : FragmentActivity() {
 
     var daemon = CompletableDeferred<MullvadDaemon>()
         private set
+    var service = CompletableDeferred<MullvadVpnService.LocalBinder>()
+        private set
 
     var currentVersion = fetchCurrentVersion()
 
@@ -54,13 +56,18 @@ class MainActivity : FragmentActivity() {
         override fun onServiceConnected(className: ComponentName, binder: IBinder) {
             val localBinder = binder as MullvadVpnService.LocalBinder
 
+            service.complete(localBinder)
+
             waitForDaemonJob = GlobalScope.launch(Dispatchers.Default) {
                 daemon.complete(localBinder.daemon.await())
             }
         }
 
         override fun onServiceDisconnected(className: ComponentName) {
+            service.cancel()
             daemon.cancel()
+
+            service = CompletableDeferred<MullvadVpnService.LocalBinder>()
             daemon = CompletableDeferred<MullvadDaemon>()
         }
     }