diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-16 13:43:32 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-01-07 14:03:29 +0000 |
| commit | b6798f1d348a0cb3ee56dbc56f986f1c5a704a10 (patch) | |
| tree | 263dcb3ef6b6365296dafdd3e240aa3e3715aaf5 /android/src | |
| parent | e707a93c064909ba011894d4a09c095dd5d86fa8 (diff) | |
| download | mullvadvpn-b6798f1d348a0cb3ee56dbc56f986f1c5a704a10.tar.xz mullvadvpn-b6798f1d348a0cb3ee56dbc56f986f1c5a704a10.zip | |
Use synchronous daemon in `WwwAuthTokenRetriever`
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/WwwAuthTokenRetriever.kt | 5 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt | 12 |
2 files changed, 3 insertions, 14 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/WwwAuthTokenRetriever.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/WwwAuthTokenRetriever.kt index cc633f0b22..0957895c2e 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/WwwAuthTokenRetriever.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/WwwAuthTokenRetriever.kt @@ -1,14 +1,13 @@ package net.mullvad.mullvadvpn.dataproxy -import kotlinx.coroutines.Deferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.async import net.mullvad.mullvadvpn.service.MullvadDaemon -class WwwAuthTokenRetriever(val daemon: Deferred<MullvadDaemon>) { +class WwwAuthTokenRetriever(val daemon: MullvadDaemon) { suspend fun getAuthToken() = GlobalScope.async(Dispatchers.Default) { // returning an empty string is valid in case of any failures - daemon.await().getWwwAuthToken() + daemon.getWwwAuthToken() } } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt index 140c4c669c..30ba233a5d 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt @@ -1,6 +1,5 @@ package net.mullvad.mullvadvpn.ui -import kotlinx.coroutines.CompletableDeferred import net.mullvad.mullvadvpn.dataproxy.AccountCache import net.mullvad.mullvadvpn.dataproxy.AppVersionInfoCache import net.mullvad.mullvadvpn.dataproxy.KeyStatusListener @@ -8,14 +7,9 @@ import net.mullvad.mullvadvpn.dataproxy.LocationInfoCache import net.mullvad.mullvadvpn.dataproxy.RelayListListener import net.mullvad.mullvadvpn.dataproxy.SettingsListener import net.mullvad.mullvadvpn.dataproxy.WwwAuthTokenRetriever -import net.mullvad.mullvadvpn.service.MullvadDaemon import net.mullvad.mullvadvpn.service.ServiceInstance -import net.mullvad.talpid.ConnectivityListener class ServiceConnection(private val service: ServiceInstance, val mainActivity: MainActivity) { - private val asyncDaemon = CompletableDeferred<MullvadDaemon>() - private val asyncConnectivityListener = CompletableDeferred<ConnectivityListener>() - val daemon = service.daemon val connectionProxy = service.connectionProxy val connectivityListener = service.connectivityListener @@ -26,18 +20,14 @@ class ServiceConnection(private val service: ServiceInstance, val mainActivity: val accountCache = AccountCache(settingsListener, daemon) var relayListListener = RelayListListener(daemon, settingsListener) val locationInfoCache = LocationInfoCache(daemon, connectivityListener, relayListListener) - val wwwAuthTokenRetriever = WwwAuthTokenRetriever(asyncDaemon) + val wwwAuthTokenRetriever = WwwAuthTokenRetriever(daemon) init { - asyncDaemon.complete(daemon) appVersionInfoCache.onCreate() - connectionProxy.mainActivity = mainActivity } fun onDestroy() { - asyncDaemon.cancel() - accountCache.onDestroy() appVersionInfoCache.onDestroy() keyStatusListener.onDestroy() |