diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-01-11 17:42:05 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2021-04-20 13:55:40 +0000 |
| commit | 01532d3899a6c057b37dbf8514742b05a23b3182 (patch) | |
| tree | d7e7a102ee0dd99f6b408c0e8234a33efa3affb0 /android/src | |
| parent | fda0d71fc634051027ceac503e1a3768e95207b1 (diff) | |
| download | mullvadvpn-01532d3899a6c057b37dbf8514742b05a23b3182.tar.xz mullvadvpn-01532d3899a6c057b37dbf8514742b05a23b3182.zip | |
Make `AuthTokenCache` available to fragments
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt | 5 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/serviceconnection/ServiceConnection.kt | 2 |
2 files changed, 7 insertions, 0 deletions
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 0da72332a8..c7358f7a88 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceDependentFragment.kt @@ -8,6 +8,7 @@ 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 import net.mullvad.mullvadvpn.ui.serviceconnection.ConnectionProxy import net.mullvad.mullvadvpn.ui.serviceconnection.CustomDns import net.mullvad.mullvadvpn.ui.serviceconnection.KeyStatusListener @@ -40,6 +41,9 @@ abstract class ServiceDependentFragment(private val onNoService: OnNoService) : lateinit var appVersionInfoCache: AppVersionInfoCache private set + lateinit var authTokenCache: AuthTokenCache + private set + lateinit var connectionProxy: ConnectionProxy private set @@ -69,6 +73,7 @@ abstract class ServiceDependentFragment(private val onNoService: OnNoService) : // initialization of the fields doesn't have to be synchronized accountCache = serviceConnection.accountCache appVersionInfoCache = serviceConnection.appVersionInfoCache + authTokenCache = serviceConnection.authTokenCache connectionProxy = serviceConnection.connectionProxy customDns = serviceConnection.customDns daemon = serviceConnection.daemon 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 61f2f6ef5e..95c28b810e 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 @@ -32,6 +32,7 @@ class ServiceConnection(private val service: ServiceInstance) : KoinScopeCompone val daemon = service.daemon val accountCache = AccountCache(service.messenger, dispatcher) + val authTokenCache = AuthTokenCache(service.messenger, dispatcher) val connectionProxy = ConnectionProxy(service.messenger, dispatcher) val keyStatusListener = KeyStatusListener(service.messenger, dispatcher) val locationInfoCache = LocationInfoCache(dispatcher) @@ -54,6 +55,7 @@ class ServiceConnection(private val service: ServiceInstance) : KoinScopeCompone dispatcher.onDestroy() accountCache.onDestroy() + authTokenCache.onDestroy() connectionProxy.onDestroy() keyStatusListener.onDestroy() locationInfoCache.onDestroy() |