diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2020-04-27 13:59:12 +0100 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2020-04-27 13:59:12 +0100 |
| commit | 4f1d2ba90546907e9905ac9ec72731613e559294 (patch) | |
| tree | 2ad92e79d6e0c173e5b84a9cfe57102b121895f6 /android/src | |
| parent | f9573c6f0360a6dcd0e334285e2ae91120234100 (diff) | |
| parent | 9260448c0f523e041453f413bff4fef957753c3f (diff) | |
| download | mullvadvpn-4f1d2ba90546907e9905ac9ec72731613e559294.tar.xz mullvadvpn-4f1d2ba90546907e9905ac9ec72731613e559294.zip | |
Merge branch 'use-rest-new-hyper'
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt | 2 | ||||
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt | 3 |
2 files changed, 3 insertions, 2 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 dab1b0b7ae..40a87ac4b6 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt @@ -35,7 +35,7 @@ class AppVersionInfoCache( val latest get() = appVersionInfo?.latest val isSupported - get() = appVersionInfo?.currentIsSupported ?: true + get() = appVersionInfo?.supported ?: true val isOutdated: Boolean get() { 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 0c41090f3f..2fe8b9d3ed 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/model/AppVersionInfo.kt @@ -1,7 +1,8 @@ package net.mullvad.mullvadvpn.model data class AppVersionInfo( - val currentIsSupported: Boolean, + val supported: Boolean, val latestStable: String, + val latestBeta: String, val latest: String ) |