diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-01-05 21:33:08 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-04-13 17:21:48 +0000 |
| commit | 4bc2dbdb77b5925ac541e360442a961bff134d64 (patch) | |
| tree | 3bb8591ac64d69d4ab985f4ab200f50ead05ea75 | |
| parent | 44b1c1d91a29994a8fc1363f8b18f8ff1627d3dc (diff) | |
| download | mullvadvpn-4bc2dbdb77b5925ac541e360442a961bff134d64.tar.xz mullvadvpn-4bc2dbdb77b5925ac541e360442a961bff134d64.zip | |
Remove `CustomDns` from `ServiceInstance`
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 9 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt | 12 |
2 files changed, 2 insertions, 19 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 64a31ca474..713c318ae1 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -57,8 +57,6 @@ class MullvadVpnService : TalpidVpnService() { private var instance by observable<ServiceInstance?>(null) { _, oldInstance, newInstance -> if (newInstance != oldInstance) { - oldInstance?.onDestroy() - accountExpiryNotification = newInstance?.let { instance -> AccountExpiryNotification(this, instance.daemon, endpoint.accountCache) } @@ -244,12 +242,7 @@ class MullvadVpnService : TalpidVpnService() { handlePendingAction(settings) if (state == State.Running) { - instance = ServiceInstance( - endpoint.messenger, - daemon, - daemonInstance.intermittentDaemon, - customDns - ) + instance = ServiceInstance(endpoint.messenger, daemon) } } 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 f4e898d143..383e735b24 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt @@ -1,15 +1,5 @@ package net.mullvad.mullvadvpn.service import android.os.Messenger -import net.mullvad.mullvadvpn.util.Intermittent -class ServiceInstance( - val messenger: Messenger, - val daemon: MullvadDaemon, - val intermittentDaemon: Intermittent<MullvadDaemon>, - val customDns: CustomDns, -) { - fun onDestroy() { - customDns.onDestroy() - } -} +class ServiceInstance(val messenger: Messenger, val daemon: MullvadDaemon) |