Always handle commands the same way

Both when starting the service and when the service is already running.

1 files changed, 7 insertions, 13 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 b21e7a34be..44b2e9c02c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -68,20 +68,14 @@ class MullvadVpnService : TalpidVpnService() {
     private lateinit var notificationManager: ForegroundNotificationManager
     private lateinit var tunnelStateUpdater: TunnelStateUpdater
 
-    private var pendingAction: PendingAction? = null
-        set(value) {
-            field = value
-
-            instance?.connectionProxy?.let { activeConnectionProxy ->
-                when (value) {
-                    PendingAction.Connect -> activeConnectionProxy.connect()
-                    PendingAction.Disconnect -> activeConnectionProxy.disconnect()
-                    null -> {}
-                }
-
-                field = null
-            }
+    private var pendingAction by observable<PendingAction?>(null) { _, _, action ->
+        instance?.let { activeInstance ->
+            handlePendingAction(
+                activeInstance.connectionProxy,
+                activeInstance.settingsListener.settings
+            )
         }
+    }
 
     private var isBound by observable(false) { _, _, isBound ->
         notificationManager.lockedToForeground = isBound