diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-11 22:46:00 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-01-07 14:03:28 +0000 |
| commit | 3122a3f6bed5844bb2cc1b121761e67cce0eb5eb (patch) | |
| tree | 320b97a7b0d306faaf73caeea18d1fcf2c2486d2 /android | |
| parent | 54d6b88002a372c1e24535a08f211fef7bf7c679 (diff) | |
| download | mullvadvpn-3122a3f6bed5844bb2cc1b121761e67cce0eb5eb.tar.xz mullvadvpn-3122a3f6bed5844bb2cc1b121761e67cce0eb5eb.zip | |
Use synchronous daemon in `AccountCache`
Diffstat (limited to 'android')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AccountCache.kt | 5 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AccountCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AccountCache.kt index 44001c5de9..35abe6d53a 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AccountCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AccountCache.kt @@ -1,6 +1,5 @@ package net.mullvad.mullvadvpn.dataproxy -import kotlinx.coroutines.Deferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.Job @@ -12,7 +11,7 @@ import org.joda.time.format.DateTimeFormat val EXPIRY_FORMAT = DateTimeFormat.forPattern("YYYY-MM-dd HH:mm:ss z") -class AccountCache(val settingsListener: SettingsListener, val daemon: Deferred<MullvadDaemon>) { +class AccountCache(val settingsListener: SettingsListener, val daemon: MullvadDaemon) { private var fetchJob: Job? = null private var accountNumber: String? = null private var accountExpiry: DateTime? = null @@ -55,7 +54,7 @@ class AccountCache(val settingsListener: SettingsListener, val daemon: Deferred< private fun fetchAccountExpiry() = GlobalScope.launch(Dispatchers.Default) { val accountNumber = this@AccountCache.accountNumber val accountData = accountNumber?.let { account -> - val result = daemon.await().getAccountData(account) + val result = daemon.getAccountData(account) when (result) { is GetAccountDataResult.Ok -> result.accountData 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 831d52274f..7c7ab27887 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt @@ -23,7 +23,7 @@ class ServiceConnection(private val service: ServiceInstance, val mainActivity: val appVersionInfoCache = AppVersionInfoCache(mainActivity, asyncDaemon) val keyStatusListener = KeyStatusListener(asyncDaemon) val settingsListener = SettingsListener(asyncDaemon) - val accountCache = AccountCache(settingsListener, asyncDaemon) + val accountCache = AccountCache(settingsListener, daemon) var relayListListener = RelayListListener(asyncDaemon, settingsListener) val locationInfoCache = LocationInfoCache(asyncDaemon, asyncConnectivityListener, relayListListener) |