Create `handlePendingAction` helper method

1 files changed, 19 insertions, 16 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 9ee87d015e..b21e7a34be 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -221,22 +221,7 @@ class MullvadVpnService : TalpidVpnService() {
 
     private fun setUpInstance(daemon: MullvadDaemon, settings: Settings) {
         val settingsListener = SettingsListener(daemon, settings)
-
-        val connectionProxy = ConnectionProxy(this, daemon).apply {
-            when (pendingAction) {
-                PendingAction.Connect -> {
-                    if (settings.accountToken != null) {
-                        connect()
-                    } else {
-                        openUi()
-                    }
-                }
-                PendingAction.Disconnect -> disconnect()
-                null -> {}
-            }
-
-            pendingAction = null
-        }
+        val connectionProxy = ConnectionProxy(this, daemon)
 
         val splitTunneling = SplitTunneling(this).apply {
             onChange = { excludedApps ->
@@ -246,6 +231,8 @@ class MullvadVpnService : TalpidVpnService() {
             }
         }
 
+        handlePendingAction(connectionProxy, settings)
+
         instance = ServiceInstance(
             daemon,
             connectionProxy,
@@ -279,6 +266,22 @@ class MullvadVpnService : TalpidVpnService() {
         setUp()
     }
 
+    private fun handlePendingAction(connectionProxy: ConnectionProxy, settings: Settings) {
+        when (pendingAction) {
+            PendingAction.Connect -> {
+                if (settings.accountToken != null) {
+                    connectionProxy.connect()
+                } else {
+                    openUi()
+                }
+            }
+            PendingAction.Disconnect -> connectionProxy.disconnect()
+            null -> {}
+        }
+
+        pendingAction = null
+    }
+
     private fun openUi() {
         val intent = Intent(this, MainActivity::class.java).apply {
             addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)