Update notification banner on version info changes

2 files changed, 12 insertions, 0 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
index 09aadb0a7a..45dfb620a5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
@@ -103,6 +103,8 @@ class ConnectFragment : Fragment() {
     override fun onResume() {
         super.onResume()
 
+        notificationBanner.onResume()
+
         locationInfo.isTunnelInfoExpanded = isTunnelInfoExpanded
 
         keyStatusListener.onKeyStatusChange = { keyStatus ->
@@ -126,6 +128,8 @@ class ConnectFragment : Fragment() {
 
         isTunnelInfoExpanded = locationInfo.isTunnelInfoExpanded
 
+        notificationBanner.onPause()
+
         super.onPause()
     }
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
index 992945ecef..aa0aea2afe 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/NotificationBanner.kt
@@ -46,6 +46,14 @@ class NotificationBanner(
         banner.setOnClickListener { onClick() }
     }
 
+    fun onResume() {
+        versionInfoCache.onUpdate = { update() }
+    }
+
+    fun onPause() {
+        versionInfoCache.onUpdate = null
+    }
+
     private fun update() {
         externalLink = null
         updateBasedOnKeyState() || updateBasedOnTunnelState() || updateBasedOnVersionInfo()