summaryrefslogtreecommitdiffhomepage
path: root/android/src/main
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-08-06 10:02:46 -0300
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-08-06 10:02:46 -0300
commit3a41c3cd5bf5a9260c467579621f51b376d46fa2 (patch)
treec2ae4ea359521aade5d7d8a86b85299e73f6fe3c /android/src/main
parent29e3c002ad7fe8ebc0612344488a437815e298b2 (diff)
parentb609b9bd84447f127e8b9a8f9376a3d63a68c16e (diff)
downloadmullvadvpn-3a41c3cd5bf5a9260c467579621f51b376d46fa2.tar.xz
mullvadvpn-3a41c3cd5bf5a9260c467579621f51b376d46fa2.zip
Merge branch 'fix-version-fetch-race-condition'
Diffstat (limited to 'android/src/main')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt2
1 files changed, 1 insertions, 1 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 bcf0fef11e..cc5dff4417 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt
@@ -83,7 +83,7 @@ class AppVersionInfoCache(val parentActivity: MainActivity) {
private fun updateUpgradeVersion() {
val target = if (isStable) latestStable else latest
- if (target == version) {
+ if (target == version || target == null) {
isLatest = true
upgradeVersion = null
} else {