Create `SplitTunneling` instance sooner

Loads the excluded app list before the daemon is started.

1 files changed, 12 insertions, 6 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 819886d1f6..f498b9bf7f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -67,6 +67,7 @@ class MullvadVpnService : TalpidVpnService() {
 
     private lateinit var keyguardManager: KeyguardManager
     private lateinit var notificationManager: ForegroundNotificationManager
+    private lateinit var splitTunneling: SplitTunneling
     private lateinit var tunnelStateUpdater: TunnelStateUpdater
 
     private var pendingAction by observable<PendingAction?>(null) { _, _, action ->
@@ -96,6 +97,13 @@ class MullvadVpnService : TalpidVpnService() {
 
         notificationManager.acknowledgeStartForegroundService()
 
+        splitTunneling = SplitTunneling(this).apply {
+            onChange = { excludedApps ->
+                disallowedApps = excludedApps
+                markTunAsStale()
+            }
+        }
+
         setUp()
     }
 
@@ -230,12 +238,10 @@ class MullvadVpnService : TalpidVpnService() {
         val settingsListener = SettingsListener(daemon, settings)
         val connectionProxy = ConnectionProxy(this, daemon)
 
-        val splitTunneling = SplitTunneling(this).apply {
-            onChange = { excludedApps ->
-                disallowedApps = excludedApps
-                markTunAsStale()
-                connectionProxy.reconnect()
-            }
+        splitTunneling.onChange = { excludedApps ->
+            disallowedApps = excludedApps
+            markTunAsStale()
+            connectionProxy.reconnect()
         }
 
         handlePendingAction(connectionProxy, settings)