Merge branch 'fix-upgrade-to-null-message'

1 files changed, 16 insertions, 16 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 cf62ffed0b..73195df86f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt
@@ -18,8 +18,22 @@ class AppVersionInfoCache(val parentActivity: MainActivity) {
     private var appVersionInfo: AppVersionInfo? = null
         set(value) {
             synchronized(this) {
-                field = value
-                updateUpgradeVersion()
+                upgradeVersion = if (isStable) value?.latestStable else value?.latest
+
+                if (value != null && upgradeVersion == version) {
+                    upgradeVersion = null
+
+                    field = AppVersionInfo(
+                        value.currentIsSupported,
+                        /* currentIsOutdated = */ false,
+                        value.latestStable,
+                        value.latest
+                    )
+                } else {
+                    field = value
+                }
+
+                onUpdate?.invoke()
             }
         }
 
@@ -65,8 +79,6 @@ class AppVersionInfoCache(val parentActivity: MainActivity) {
         version = currentVersion
         isStable = !currentVersion.contains("-")
 
-        updateUpgradeVersion()
-
         daemon.onAppVersionInfoChange = { newAppVersionInfo ->
             appVersionInfo = newAppVersionInfo
         }
@@ -83,16 +95,4 @@ class AppVersionInfoCache(val parentActivity: MainActivity) {
     private fun tearDown() = GlobalScope.launch(Dispatchers.Default) {
         daemon.await().onAppVersionInfoChange = null
     }
-
-    private fun updateUpgradeVersion() {
-        val target = if (isStable) latestStable else latest
-
-        if (target == version || target == null) {
-            upgradeVersion = null
-        } else {
-            upgradeVersion = target
-        }
-
-        onUpdate?.invoke()
-    }
 }