2 files changed, 2 insertions, 21 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
index 75b3e35177..593139a8a9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
@@ -69,7 +69,7 @@ class MullvadDaemon(val vpnService: MullvadVpnService) {
         return getRelayLocations(daemonInterfaceAddress)
     }
 
-    fun getSettings(): Settings {
+    fun getSettings(): Settings? {
         return getSettings(daemonInterfaceAddress)
     }
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt
index 2c40bfa4af..d4c73795c5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LaunchFragment.kt
@@ -8,23 +8,16 @@ import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
-import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import net.mullvad.mullvadvpn.R
-import net.mullvad.mullvadvpn.service.MullvadDaemon
 
 class LaunchFragment : ServiceAwareFragment() {
     private val hasAccountToken = CompletableDeferred<Boolean>()
 
-    private var accountTokenCheckJob: Job? = null
     private lateinit var advanceToNextScreenJob: Job
 
     override fun onNewServiceConnection(serviceConnection: ServiceConnection) {
-        accountTokenCheckJob = checkForAccountToken(serviceConnection.daemon)
-    }
-
-    override fun onNoServiceConnection() {
-        accountTokenCheckJob?.cancel()
+        hasAccountToken.complete(serviceConnection.settingsListener.settings.accountToken != null)
     }
 
     override fun onCreateView(
@@ -51,18 +44,6 @@ class LaunchFragment : ServiceAwareFragment() {
         super.onPause()
     }
 
-    override fun onDestroy() {
-        accountTokenCheckJob?.cancel()
-        super.onDestroy()
-    }
-
-    private fun checkForAccountToken(daemon: MullvadDaemon) =
-            GlobalScope.async(Dispatchers.Default) {
-        val settings = daemon.getSettings()
-
-        hasAccountToken.complete(settings.accountToken != null)
-    }
-
     private fun advanceToNextScreen() = GlobalScope.launch(Dispatchers.Main) {
         if (hasAccountToken.await()) {
             advanceToConnectScreen()