Keep notification in foreground while UI is shown

1 files changed, 8 insertions, 0 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index 3a533d18cd..4c24ad62e2 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -31,6 +31,13 @@ class MullvadVpnService : TalpidVpnService() {
         }
 
     private var isBound = false
+        set(value) {
+            field = value
+
+            if (this::notificationManager.isInitialized) {
+                notificationManager.lockedToForeground = value
+            }
+        }
 
     override fun onCreate() {
         super.onCreate()
@@ -116,6 +123,7 @@ class MullvadVpnService : TalpidVpnService() {
         return ForegroundNotificationManager(this, connectionProxy).apply {
             onConnect = { connectionProxy.connect() }
             onDisconnect = { connectionProxy.disconnect() }
+            lockedToForeground = isBound
         }
     }