Start daemon when `MainActivity` is created

1 files changed, 9 insertions, 5 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
index 8b1571c2fc..b751bf63d9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
@@ -1,6 +1,7 @@
 package net.mullvad.mullvadvpn
 
-import kotlinx.coroutines.launch
+import kotlinx.coroutines.async
+import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.CompletableDeferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -10,10 +11,12 @@ import android.os.Bundle
 import android.support.v4.app.FragmentActivity
 
 class MainActivity : FragmentActivity() {
-    private val extractApiRootCaFile = doExtractApiRootCaFile()
-
     val activityCreated = CompletableDeferred<Unit>()
 
+    val asyncDaemon = startDaemon()
+    val daemon
+        get() = runBlocking { asyncDaemon.await() }
+
     var selectedRelayItemCode: String? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -28,7 +31,7 @@ class MainActivity : FragmentActivity() {
     }
 
     override fun onDestroy() {
-        extractApiRootCaFile.cancel()
+        asyncDaemon.cancel()
 
         super.onDestroy()
     }
@@ -40,8 +43,9 @@ class MainActivity : FragmentActivity() {
         }
     }
 
-    private fun doExtractApiRootCaFile() = GlobalScope.launch(Dispatchers.Default) {
+    private fun startDaemon() = GlobalScope.async(Dispatchers.Default) {
         activityCreated.await()
         ApiRootCaFile().extract(this@MainActivity)
+        MullvadDaemon()
     }
 }