1 files changed, 7 insertions, 13 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 2e2f773962..347cffdb46 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,14 @@ class AppVersionInfoCache(val parentActivity: MainActivity) {
     private var appVersionInfo: AppVersionInfo? = null
         set(value) {
             synchronized(this) {
+                upgradeVersion = if (isStable) value?.latestStable else value?.latest
+
+                if (upgradeVersion == version) {
+                    upgradeVersion = null
+                }
+
                 field = value
-                updateUpgradeVersion()
+                onUpdate?.invoke()
             }
         }
 
@@ -81,16 +87,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()
-    }
 }