diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-03-12 20:21:43 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-03-13 15:16:31 +0000 |
| commit | 8356b41f5f0e585e7db61882a52c6b2d483ee92f (patch) | |
| tree | be79309d7842be3ab69735ecd5bedf2c9e210da7 /android/src/main | |
| parent | af068fc74117e6d0d43e6ae064ad9a4bbec92ce2 (diff) | |
| download | mullvadvpn-8356b41f5f0e585e7db61882a52c6b2d483ee92f.tar.xz mullvadvpn-8356b41f5f0e585e7db61882a52c6b2d483ee92f.zip | |
Remove obsolete `AppVersionInfo.isOutdated` field
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt | 13 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt | 1 |
2 files changed, 3 insertions, 11 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 7f267132f2..897778cf4a 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt @@ -18,7 +18,7 @@ class AppVersionInfoCache( private val setUpJob = setUp() - private val settingsListenerId = settingsListener.settingsNotifier.subscribe { settings -> + private val settingsListenerId = settingsListener.subscribe { settings -> showBetaReleases = settings.showBetaReleases ?: false } @@ -29,17 +29,9 @@ class AppVersionInfoCache( if (value != null && upgradeVersion == version) { upgradeVersion = null - - field = AppVersionInfo( - value.currentIsSupported, - /* currentIsOutdated = */ false, - value.latestStable, - value.latest - ) - } else { - field = value } + field = value onUpdate?.invoke() } } @@ -86,6 +78,7 @@ class AppVersionInfoCache( fun onDestroy() { setUpJob.cancel() + settingsListener.unsubscribe(settingsListenerId) daemon.onAppVersionInfoChange = null } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt index 5bbdee7589..0c41090f3f 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt @@ -2,7 +2,6 @@ package net.mullvad.mullvadvpn.model data class AppVersionInfo( val currentIsSupported: Boolean, - val currentIsOutdated: Boolean, val latestStable: String, val latest: String ) |