Move `currentVersion` to `AppVersionInfoCache`

3 files changed, 8 insertions, 11 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
index 0e6b4c1843..15d33fbb04 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MainActivity.kt
@@ -39,8 +39,6 @@ class MainActivity : FragmentActivity() {
     var service = CompletableDeferred<MullvadVpnService.LocalBinder>()
         private set
 
-    var currentVersion = fetchCurrentVersion()
-
     var appVersionInfoCache = AppVersionInfoCache(this)
     val connectionProxy = ConnectionProxy(this)
     val keyStatusListener = KeyStatusListener(daemon)
@@ -173,8 +171,4 @@ class MainActivity : FragmentActivity() {
     private fun fetchSettings() = GlobalScope.async(Dispatchers.Default) {
         daemon.await().getSettings()
     }
-
-    private fun fetchCurrentVersion() = GlobalScope.async(Dispatchers.Default) {
-        daemon.await().getCurrentVersion()
-    }
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt
index 5e36bfb268..a2b67ead5e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt
@@ -103,8 +103,8 @@ class SettingsFragment : Fragment() {
     }
 
     private fun showCurrentVersion() = GlobalScope.launch(Dispatchers.Main) {
-        val version = parentActivity.currentVersion.await()
         val versionInfoCache = parentActivity.appVersionInfoCache
+        val version = versionInfoCache.currentVersion.await()
 
         appVersionLabel.setText(version)
 
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 a9715173ce..929be5917c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/dataproxy/AppVersionInfoCache.kt
@@ -1,5 +1,6 @@
 package net.mullvad.mullvadvpn.dataproxy
 
+import kotlinx.coroutines.async
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -22,7 +23,7 @@ class AppVersionInfoCache(val parentActivity: MainActivity) {
     private val preferences: SharedPreferences
         get() = parentActivity.getSharedPreferences(SHARED_PREFERENCES, Context.MODE_PRIVATE)
 
-    private val updateVersionJob = updateVersion()
+    val currentVersion = fetchCurrentVersion()
 
     var version: String? = null
         private set
@@ -67,17 +68,19 @@ class AppVersionInfoCache(val parentActivity: MainActivity) {
     }
 
     fun onDestroy() {
-        updateVersionJob.cancel()
+        currentVersion.cancel()
         preferences.unregisterOnSharedPreferenceChangeListener(listener)
     }
 
-    private fun updateVersion() = GlobalScope.launch(Dispatchers.Default) {
-        val currentVersion = parentActivity.currentVersion.await()
+    private fun fetchCurrentVersion() = GlobalScope.async(Dispatchers.Default) {
+        val currentVersion = parentActivity.daemon.await().getCurrentVersion()
 
         version = currentVersion
         isStable = !currentVersion.contains("-")
 
         updateUpgradeVersion()
+
+        currentVersion
     }
 
     private fun updateUpgradeVersion() {