diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-12-11 22:50:21 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-01-07 14:03:28 +0000 |
| commit | 2adeb09f97f4a175ef853515cdaaa14d86289294 (patch) | |
| tree | dde41540d1c4931fba4557694ef78535eab2f250 /android/src | |
| parent | 3122a3f6bed5844bb2cc1b121761e67cce0eb5eb (diff) | |
| download | mullvadvpn-2adeb09f97f4a175ef853515cdaaa14d86289294.tar.xz mullvadvpn-2adeb09f97f4a175ef853515cdaaa14d86289294.zip | |
Use synchronous daemon in `AppVersionInfoCache`
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt | 10 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt | 2 |
2 files changed, 3 insertions, 9 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt index ac01929b1b..a192fb0f75 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt @@ -1,14 +1,13 @@ package net.mullvad.mullvadvpn.dataproxy import android.content.Context -import kotlinx.coroutines.Deferred import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope import kotlinx.coroutines.launch import net.mullvad.mullvadvpn.model.AppVersionInfo import net.mullvad.mullvadvpn.service.MullvadDaemon -class AppVersionInfoCache(val context: Context, val daemon: Deferred<MullvadDaemon>) { +class AppVersionInfoCache(val context: Context, val daemon: MullvadDaemon) { companion object { val LEGACY_SHARED_PREFERENCES = "app_version_info_cache" } @@ -69,11 +68,10 @@ class AppVersionInfoCache(val context: Context, val daemon: Deferred<MullvadDaem fun onDestroy() { setUpJob.cancel() - tearDown() + daemon.onAppVersionInfoChange = null } private fun setUp() = GlobalScope.launch(Dispatchers.Default) { - val daemon = this@AppVersionInfoCache.daemon.await() val currentVersion = daemon.getCurrentVersion() version = currentVersion @@ -91,8 +89,4 @@ class AppVersionInfoCache(val context: Context, val daemon: Deferred<MullvadDaem } } } - - private fun tearDown() = GlobalScope.launch(Dispatchers.Default) { - daemon.await().onAppVersionInfoChange = null - } } 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 7c7ab27887..c5acc97bd3 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ServiceConnection.kt @@ -20,7 +20,7 @@ class ServiceConnection(private val service: ServiceInstance, val mainActivity: val connectionProxy = service.connectionProxy val connectivityListener = service.connectivityListener - val appVersionInfoCache = AppVersionInfoCache(mainActivity, asyncDaemon) + val appVersionInfoCache = AppVersionInfoCache(mainActivity, daemon) val keyStatusListener = KeyStatusListener(asyncDaemon) val settingsListener = SettingsListener(asyncDaemon) val accountCache = AccountCache(settingsListener, daemon) |