Remove properties replaced by service connection

1 files changed, 0 insertions, 26 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index f9c9f24bac..0e578af680 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -13,15 +13,8 @@ import kotlinx.coroutines.Job
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 import net.mullvad.mullvadvpn.R
-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
-import net.mullvad.mullvadvpn.dataproxy.RelayListListener
-import net.mullvad.mullvadvpn.dataproxy.WwwAuthTokenRetriever
-import net.mullvad.mullvadvpn.service.MullvadDaemon
 import net.mullvad.mullvadvpn.service.MullvadVpnService
 import net.mullvad.talpid.util.EventNotifier
 
@@ -33,28 +26,14 @@ class MainActivity : FragmentActivity() {
     private var serviceConnection: ServiceConnection? = null
     private var serviceConnectionSubscription: Int? = null
 
-    var daemon = CompletableDeferred<MullvadDaemon>()
-        private set
     var service = CompletableDeferred<MullvadVpnService.LocalBinder>()
         private set
 
     val problemReport = MullvadProblemReport()
     val serviceNotifier = EventNotifier<ServiceConnection?>(null)
 
-    val appVersionInfoCache: AppVersionInfoCache
-        get() = serviceConnection!!.appVersionInfoCache
     val connectionProxy: ConnectionProxy
         get() = serviceConnection!!.connectionProxy
-    val keyStatusListener: KeyStatusListener
-        get() = serviceConnection!!.keyStatusListener
-    val relayListListener: RelayListListener
-        get() = serviceConnection!!.relayListListener
-    val locationInfoCache: LocationInfoCache
-        get() = serviceConnection!!.locationInfoCache
-    val accountCache: AccountCache
-        get() = serviceConnection!!.accountCache
-    val wwwAuthTokenRetriever: WwwAuthTokenRetriever
-        get() = serviceConnection!!.wwwAuthTokenRetriever
 
     private var quitJob: Job? = null
     private var serviceToStop: MullvadVpnService.LocalBinder? = null
@@ -78,7 +57,6 @@ class MainActivity : FragmentActivity() {
             waitForDaemonJob = GlobalScope.launch(Dispatchers.Default) {
                 localBinder.resetComplete?.await()
                 service.complete(localBinder)
-                daemon.complete(localBinder.daemon.await())
             }
         }
 
@@ -94,10 +72,7 @@ class MainActivity : FragmentActivity() {
             }
 
             service.cancel()
-            daemon.cancel()
-
             service = CompletableDeferred<MullvadVpnService.LocalBinder>()
-            daemon = CompletableDeferred<MullvadDaemon>()
 
             serviceNotifier.notify(null)
         }
@@ -144,7 +119,6 @@ class MainActivity : FragmentActivity() {
         serviceConnection?.onDestroy()
 
         waitForDaemonJob?.cancel()
-        daemon.cancel()
 
         super.onDestroy()
     }