Remove synchronous daemon property

9 files changed, 22 insertions, 25 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt
index a0a0ef291f..8464dd0531 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountFragment.kt
@@ -114,7 +114,7 @@ class AccountFragment : Fragment() {
     }
 
     private fun clearAccountNumber() = GlobalScope.launch(Dispatchers.Default) {
-        val daemon = parentActivity.asyncDaemon.await()
+        val daemon = parentActivity.daemon.await()
 
         daemon.setAccount(null)
     }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
index f627ad789a..c31b1691dc 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
@@ -54,7 +54,7 @@ class ConnectFragment : Fragment() {
         parentActivity = context as MainActivity
         locationInfoCache = parentActivity.locationInfoCache
         relayListListener = parentActivity.relayListListener
-        waitForDaemonJob = waitForDaemon(parentActivity.asyncDaemon)
+        waitForDaemonJob = waitForDaemon(parentActivity.daemon)
     }
 
     override fun onCreateView(
@@ -123,9 +123,9 @@ class ConnectFragment : Fragment() {
         }
     }
 
-    private fun waitForDaemon(asyncDaemon: Deferred<MullvadDaemon>) =
+    private fun waitForDaemon(originalDaemon: Deferred<MullvadDaemon>) =
             GlobalScope.launch(Dispatchers.Default) {
-        daemon.complete(asyncDaemon.await())
+        daemon.complete(originalDaemon.await())
     }
 
     private fun attachListener() = GlobalScope.launch(Dispatchers.Default) {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/LaunchFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/LaunchFragment.kt
index 043c8efe15..7b2ebc4453 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/LaunchFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/LaunchFragment.kt
@@ -38,7 +38,7 @@ class LaunchFragment : Fragment() {
 
     private fun checkForAccountToken() = GlobalScope.async(Dispatchers.Default) {
         val parentActivity = activity as MainActivity
-        val daemon = parentActivity.asyncDaemon.await()
+        val daemon = parentActivity.daemon.await()
         val settings = daemon.getSettings()
 
         settings.accountToken != null
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/LoginFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/LoginFragment.kt
index 0fb1dc0d55..e8b42d038c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/LoginFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/LoginFragment.kt
@@ -70,7 +70,7 @@ class LoginFragment : Fragment() {
     private fun performLogin(accountToken: String) = GlobalScope.launch(Dispatchers.Main) {
         loginJob?.cancel()
         loginJob = GlobalScope.async(Dispatchers.Default) {
-            val daemon = parentActivity.asyncDaemon.await()
+            val daemon = parentActivity.daemon.await()
             val accountData = daemon.getAccountData(accountToken)
 
             if (accountData != null) {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
index 2eaf17f8d1..457cefa3dc 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
@@ -27,15 +27,14 @@ import net.mullvad.mullvadvpn.relaylist.RelayItem
 import net.mullvad.mullvadvpn.relaylist.RelayList
 
 class MainActivity : FragmentActivity() {
-    var asyncDaemon = CompletableDeferred<MullvadDaemon>()
-    val daemon
-        get() = runBlocking { asyncDaemon.await() }
+    var daemon = CompletableDeferred<MullvadDaemon>()
+        private set
 
-    val locationInfoCache = LocationInfoCache(asyncDaemon)
+    val locationInfoCache = LocationInfoCache(daemon)
     val problemReport = MullvadProblemReport()
     var settingsListener = SettingsListener(this)
     var relayListListener = RelayListListener(this)
-    val accountCache = AccountCache(settingsListener, asyncDaemon)
+    val accountCache = AccountCache(settingsListener, daemon)
 
     private var waitForDaemonJob: Job? = null
 
@@ -44,13 +43,13 @@ class MainActivity : FragmentActivity() {
             val localBinder = binder as MullvadVpnService.LocalBinder
 
             waitForDaemonJob = GlobalScope.launch(Dispatchers.Default) {
-                asyncDaemon.complete(localBinder.asyncDaemon.await())
+                daemon.complete(localBinder.daemon.await())
             }
         }
 
         override fun onServiceDisconnected(className: ComponentName) {
-            asyncDaemon.cancel()
-            asyncDaemon = CompletableDeferred<MullvadDaemon>()
+            daemon.cancel()
+            daemon = CompletableDeferred<MullvadDaemon>()
         }
     }
 
@@ -84,7 +83,7 @@ class MainActivity : FragmentActivity() {
         settingsListener.onDestroy()
 
         waitForDaemonJob?.cancel()
-        asyncDaemon.cancel()
+        daemon.cancel()
 
         super.onDestroy()
     }
@@ -111,6 +110,6 @@ class MainActivity : FragmentActivity() {
     }
 
     private fun fetchSettings() = GlobalScope.async(Dispatchers.Default) {
-        asyncDaemon.await().getSettings()
+        daemon.await().getSettings()
     }
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt
index e728752461..d8c340bcd2 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt
@@ -22,9 +22,7 @@ class MullvadVpnService : VpnService() {
     private val created = CompletableDeferred<Unit>()
     private val binder = LocalBinder()
 
-    val asyncDaemon = startDaemon()
-    val daemon
-        get() = runBlocking { asyncDaemon.await() }
+    val daemon = startDaemon()
 
     override fun onCreate() {
         created.complete(Unit)
@@ -37,7 +35,7 @@ class MullvadVpnService : VpnService() {
 
     override fun onDestroy() {
         connectivityListener.unregister(this)
-        asyncDaemon.cancel()
+        daemon.cancel()
         created.cancel()
     }
 
@@ -72,8 +70,8 @@ class MullvadVpnService : VpnService() {
     }
 
     inner class LocalBinder : Binder() {
-        val asyncDaemon
-            get() = this@MullvadVpnService.asyncDaemon
+        val daemon
+            get() = this@MullvadVpnService.daemon
     }
 
     private fun startDaemon() = GlobalScope.async(Dispatchers.Default) {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/SelectLocationFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/SelectLocationFragment.kt
index 1d747f16e7..f0d9af7913 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/SelectLocationFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/SelectLocationFragment.kt
@@ -104,7 +104,7 @@ class SelectLocationFragment : Fragment() {
         val constraint: Constraint<LocationConstraint> =
             relayItem?.run { Constraint.Only(location) } ?: Constraint.Any()
 
-        parentActivity.asyncDaemon.await().updateRelaySettings(
+        parentActivity.daemon.await().updateRelaySettings(
             RelaySettingsUpdate.RelayConstraintsUpdate(constraint)
         )
     }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt
index 9e2497d471..d1a33b2f38 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/RelayListListener.kt
@@ -54,7 +54,7 @@ class RelayListListener(val parentActivity: MainActivity) {
     }
 
     private fun setUp() = GlobalScope.launch(Dispatchers.Default) {
-        daemon.complete(parentActivity.asyncDaemon.await())
+        daemon.complete(parentActivity.daemon.await())
 
         setUpListener()
         fetchInitialRelayList()
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/SettingsListener.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/SettingsListener.kt
index 8df499ad53..63b589fbca 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/SettingsListener.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/SettingsListener.kt
@@ -41,7 +41,7 @@ class SettingsListener(val parentActivity: MainActivity) {
     }
 
     private fun setUp() = GlobalScope.launch(Dispatchers.Default) {
-        daemon = parentActivity.asyncDaemon.await()
+        daemon = parentActivity.daemon.await()
         daemon.onSettingsChange = { settings -> handleNewSettings(settings) }
         fetchInitialSettings()
     }