1 files changed, 8 insertions, 1 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt
index 8167d9e395..08fde91f95 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/MullvadVpnService.kt
@@ -98,7 +98,7 @@ class MullvadVpnService : VpnService() {
     private fun setUp() {
         daemon = startDaemon()
         connectionProxy = ConnectionProxy(this, daemon)
-        notificationManager = ForegroundNotificationManager(this, connectionProxy)
+        notificationManager = startNotificationManager()
         versionInfoFetcher = AppVersionInfoFetcher(daemon, this)
     }
 
@@ -108,6 +108,13 @@ class MullvadVpnService : VpnService() {
         MullvadDaemon(this@MullvadVpnService)
     }
 
+    private fun startNotificationManager(): ForegroundNotificationManager {
+        return ForegroundNotificationManager(this, connectionProxy).apply {
+            onConnect = { connectionProxy.connect() }
+            onDisconnect = { connectionProxy.disconnect() }
+        }
+    }
+
     private fun stop() {
         this@MullvadVpnService.resetComplete = CompletableDeferred()