Show current version in Settings

1 files changed, 23 insertions, 0 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt
index 01b6f5a989..967e91b6f9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/SettingsFragment.kt
@@ -1,5 +1,10 @@
 package net.mullvad.mullvadvpn
 
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.Job
+
 import android.content.Context
 import android.content.Intent
 import android.net.Uri
@@ -10,10 +15,14 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageButton
+import android.widget.TextView
 
 class SettingsFragment : Fragment() {
     private lateinit var parentActivity: MainActivity
     private lateinit var remainingTimeLabel: RemainingTimeLabel
+    private lateinit var appVersionLabel: TextView
+
+    private var showCurrentVersionJob: Job? = null
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
@@ -47,6 +56,9 @@ class SettingsFragment : Fragment() {
         }
 
         remainingTimeLabel = RemainingTimeLabel(parentActivity, view)
+        appVersionLabel = view.findViewById<TextView>(R.id.app_version_label)
+
+        showCurrentVersionJob = showCurrentVersion()
 
         return view
     }
@@ -61,6 +73,11 @@ class SettingsFragment : Fragment() {
         super.onPause()
     }
 
+    override fun onDestroyView() {
+        showCurrentVersionJob?.cancel()
+        super.onDestroyView()
+    }
+
     private fun openSubFragment(fragment: Fragment) {
         fragmentManager?.beginTransaction()?.apply {
             setCustomAnimations(
@@ -80,4 +97,10 @@ class SettingsFragment : Fragment() {
 
         startActivity(intent)
     }
+
+    private fun showCurrentVersion() = GlobalScope.launch(Dispatchers.Main) {
+        val version = parentActivity.currentVersion.await()
+
+        appVersionLabel.setText(version)
+    }
 }