diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-12-17 18:44:33 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-03-31 14:36:30 +0000 |
| commit | e7242208e5540767d2a09189c6907b333ed85fae (patch) | |
| tree | 436e60620b19d5876686defc7600e6288fc8cfc9 /android | |
| parent | ea6e76015cc95529f98fa4a0afb4606c134228e8 (diff) | |
| download | mullvadvpn-e7242208e5540767d2a09189c6907b333ed85fae.tar.xz mullvadvpn-e7242208e5540767d2a09189c6907b333ed85fae.zip | |
Remove `AccountCache` from `ServiceInstance`
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt | 3 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt | 2 |
2 files changed, 1 insertions, 4 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 ba7f7b9dac..939d6a1d86 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt @@ -58,7 +58,7 @@ class MullvadVpnService : TalpidVpnService() { oldInstance?.onDestroy() accountExpiryNotification = newInstance?.let { instance -> - AccountExpiryNotification(this, instance.daemon, instance.accountCache) + AccountExpiryNotification(this, instance.daemon, endpoint.accountCache) } serviceNotifier.notify(newInstance) @@ -256,7 +256,6 @@ class MullvadVpnService : TalpidVpnService() { endpoint.messenger, daemon, daemonInstance.intermittentDaemon, - endpoint.accountCache, connectionProxy, customDns, splitTunneling 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 23822806cf..483fbce6e5 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ServiceInstance.kt @@ -1,14 +1,12 @@ package net.mullvad.mullvadvpn.service import android.os.Messenger -import net.mullvad.mullvadvpn.service.endpoint.AccountCache import net.mullvad.mullvadvpn.util.Intermittent class ServiceInstance( val messenger: Messenger, val daemon: MullvadDaemon, val intermittentDaemon: Intermittent<MullvadDaemon>, - val accountCache: AccountCache, val connectionProxy: ConnectionProxy, val customDns: CustomDns, val splitTunneling: SplitTunneling |