Move `ConnectionProxy` to `MullvadVpnService`

2 files changed, 6 insertions, 2 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
index 958b4aedc0..fff27be8b5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
@@ -19,7 +19,6 @@ import android.support.v4.app.FragmentActivity
 
 import net.mullvad.mullvadvpn.dataproxy.AccountCache
 import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache
-import net.mullvad.mullvadvpn.dataproxy.ConnectionProxy
 import net.mullvad.mullvadvpn.dataproxy.KeyStatusListener
 import net.mullvad.mullvadvpn.dataproxy.LocationInfoCache
 import net.mullvad.mullvadvpn.dataproxy.MullvadProblemReport
@@ -157,7 +156,7 @@ class MainActivity : FragmentActivity() {
     }
 
     private fun configureConnectionProxy() = GlobalScope.async(Dispatchers.Default) {
-        ConnectionProxy(this@MainActivity, daemon).apply {
+        service.await().connectionProxy.apply {
             mainActivity = this@MainActivity
         }
     }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt
index d624b9fe62..60cd6bceeb 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt
@@ -19,6 +19,7 @@ import android.os.IBinder
 import android.support.v4.app.NotificationCompat
 
 import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoFetcher
+import net.mullvad.mullvadvpn.dataproxy.ConnectionProxy
 import net.mullvad.mullvadvpn.model.TunConfig
 
 val ONGOING_NOTIFICATION_ID: Int = 1
@@ -30,6 +31,7 @@ class MullvadVpnService : VpnService() {
     private lateinit var versionInfoFetcher: AppVersionInfoFetcher
 
     val daemon = startDaemon()
+    val connectionProxy = ConnectionProxy(this, daemon)
 
     override fun onCreate() {
         versionInfoFetcher = AppVersionInfoFetcher(daemon, this)
@@ -42,6 +44,7 @@ class MullvadVpnService : VpnService() {
     }
 
     override fun onDestroy() {
+        connectionProxy.onDestroy()
         versionInfoFetcher.stop()
         daemon.cancel()
         created.cancel()
@@ -77,6 +80,8 @@ class MullvadVpnService : VpnService() {
     inner class LocalBinder : Binder() {
         val daemon
             get() = this@MullvadVpnService.daemon
+        val connectionProxy
+            get() = this@MullvadVpnService.connectionProxy
 
         fun stop() {
             if (daemon.isCompleted) {