Merge branch 'fix-app-version-update-on-wrong-thread'

1 files changed, 6 insertions, 1 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
index ff6330d975..c5cd816ce2 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
@@ -41,6 +41,8 @@ class NotificationBanner(
     private val message: TextView = parentView.findViewById(R.id.notification_message)
     private val icon: View = parentView.findViewById(R.id.notification_icon)
 
+    private var updateJob: Job? = null
+
     private var externalLink: ExternalLink? = null
     private var visible = false
 
@@ -83,11 +85,14 @@ class NotificationBanner(
     }
 
     fun onResume() {
-        versionInfoCache.onUpdate = { update() }
+        versionInfoCache.onUpdate = {
+            updateJob = GlobalScope.launch(Dispatchers.Main) { update() }
+        }
     }
 
     fun onPause() {
         versionInfoCache.onUpdate = null
+        updateJob?.cancel()
         keyManagementController.onPause()
     }