Always calculate `upgradeVersion` when necessary

1 files changed, 17 insertions, 9 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 897778cf4a..d006c1ece0 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt
@@ -25,12 +25,6 @@ class AppVersionInfoCache(
     private var appVersionInfo: AppVersionInfo? = null
         set(value) {
             synchronized(this) {
-                upgradeVersion = if (isStable) value?.latestStable else value?.latest
-
-                if (value != null && upgradeVersion == version) {
-                    upgradeVersion = null
-                }
-
                 field = value
                 onUpdate?.invoke()
             }
@@ -61,14 +55,28 @@ class AppVersionInfoCache(
             }
         }
 
+    val upgradeVersion: String?
+        get() {
+            if (showBetaReleases) {
+                if (version == latest) {
+                    return null
+                } else {
+                    return latest
+                }
+            } else {
+                if (version == latestStable) {
+                    return null
+                } else {
+                    return latestStable
+                }
+            }
+        }
+
     var version: String? = null
         private set
     var isStable = true
         private set
 
-    var upgradeVersion: String? = null
-        private set
-
     fun onCreate() {
         context.getSharedPreferences(LEGACY_SHARED_PREFERENCES, Context.MODE_PRIVATE)
             .edit()