diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-01-15 21:29:14 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-04-23 14:04:43 +0000 |
| commit | b9bd3c966f14e51ca20360449a4d81a3a3d6fb8b (patch) | |
| tree | 7d65b6575b20ff46bb63caf81ef330ade74d8801 /android/src | |
| parent | 1ecb1373aa4bc12ac65230a329ee5338269d2512 (diff) | |
| download | mullvadvpn-b9bd3c966f14e51ca20360449a4d81a3a3d6fb8b.tar.xz mullvadvpn-b9bd3c966f14e51ca20360449a4d81a3a3d6fb8b.zip | |
Remove daemon instance from service connection
Diffstat (limited to 'android/src')
4 files changed, 4 insertions, 10 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt index 520952627d..102d2b455b 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -224,18 +224,18 @@ class MullvadVpnService : TalpidVpnService() { val settings = daemon.getSettings() if (settings != null) { - setUpInstance(daemon, settings) + setUpInstance(settings) } else { restart() } } } - private suspend fun setUpInstance(daemon: MullvadDaemon, settings: Settings) { + private suspend fun setUpInstance(settings: Settings) { handlePendingAction(settings) if (state == State.Running) { - instance = ServiceInstance(endpoint.messenger, daemon) + instance = ServiceInstance(endpoint.messenger) } } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt index 383e735b24..a77e58447d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt @@ -2,4 +2,4 @@ package net.mullvad.mullvadvpn.service import android.os.Messenger -class ServiceInstance(val messenger: Messenger, val daemon: MullvadDaemon) +class ServiceInstance(val messenger: Messenger) diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt index f64849d017..024c290b9d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt @@ -5,7 +5,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import net.mullvad.mullvadvpn.R -import net.mullvad.mullvadvpn.service.MullvadDaemon import net.mullvad.mullvadvpn.ui.serviceconnection.AccountCache import net.mullvad.mullvadvpn.ui.serviceconnection.AppVersionInfoCache import net.mullvad.mullvadvpn.ui.serviceconnection.AuthTokenCache @@ -50,9 +49,6 @@ abstract class ServiceDependentFragment(private val onNoService: OnNoService) : lateinit var customDns: CustomDns private set - lateinit var daemon: MullvadDaemon - private set - lateinit var keyStatusListener: KeyStatusListener private set @@ -76,7 +72,6 @@ abstract class ServiceDependentFragment(private val onNoService: OnNoService) : authTokenCache = serviceConnection.authTokenCache connectionProxy = serviceConnection.connectionProxy customDns = serviceConnection.customDns - daemon = serviceConnection.daemon keyStatusListener = serviceConnection.keyStatusListener locationInfoCache = serviceConnection.locationInfoCache relayListListener = serviceConnection.relayListListener diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt index f25ed2c19c..9c80ff61ca 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt @@ -33,7 +33,6 @@ class ServiceConnection( named(SERVICE_CONNECTION_SCOPE), this ) - val daemon = service.daemon val accountCache = AccountCache(service.messenger, dispatcher) val authTokenCache = AuthTokenCache(service.messenger, dispatcher) val connectionProxy = ConnectionProxy(service.messenger, dispatcher) |