diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-08-15 13:39:00 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-08-15 19:40:14 +0000 |
| commit | 9980ce8fece16f356dd028bd5f4ea6e5e93d7317 (patch) | |
| tree | 508cf5ea3037076a8e789fe3059cfc8719cb5df8 | |
| parent | 1c118e54fc3fe5127c680de17af21f14eeb01de0 (diff) | |
| download | mullvadvpn-9980ce8fece16f356dd028bd5f4ea6e5e93d7317.tar.xz mullvadvpn-9980ce8fece16f356dd028bd5f4ea6e5e93d7317.zip | |
Remove `currentVersion` property
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt | 9 |
1 files changed, 3 insertions, 6 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 6487b1c5fb..ecd31e1e90 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt @@ -1,6 +1,5 @@ package net.mullvad.mullvadvpn.dataproxy -import kotlinx.coroutines.async import kotlinx.coroutines.launch import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.GlobalScope @@ -23,7 +22,7 @@ class AppVersionInfoCache(val parentActivity: MainActivity) { private val preferences: SharedPreferences get() = parentActivity.getSharedPreferences(SHARED_PREFERENCES, Context.MODE_PRIVATE) - val currentVersion = fetchCurrentVersion() + private val fetchCurrentVersionJob = fetchCurrentVersion() var onUpdate: (() -> Unit)? = null set(value) { @@ -74,19 +73,17 @@ class AppVersionInfoCache(val parentActivity: MainActivity) { } fun onDestroy() { - currentVersion.cancel() + fetchCurrentVersionJob.cancel() preferences.unregisterOnSharedPreferenceChangeListener(listener) } - private fun fetchCurrentVersion() = GlobalScope.async(Dispatchers.Default) { + private fun fetchCurrentVersion() = GlobalScope.launch(Dispatchers.Default) { val currentVersion = parentActivity.daemon.await().getCurrentVersion() version = currentVersion isStable = !currentVersion.contains("-") updateUpgradeVersion() - - currentVersion } private fun updateUpgradeVersion() { |
