Merge branch 'bugfix/network-protection-ios17' into staging-2.11.0

ivpn · Oct 18, 2023 · aa97036 · aa97036
2 parents 68febfa + 9c83415
commit aa97036
Showing 1 changed file with 8 additions and 17 deletions.
diff --git a/IVPNClient/Managers/VPNManager.swift b/IVPNClient/Managers/VPNManager.swift
@@ -232,27 +232,23 @@ class VPNManager {
     func installOnDemandRules(settings: ConnectionSettings, accessDetails: AccessDetails) {
         switch settings {
         case .ipsec:
-            self.disable(tunnelType: .openvpn) { _ in
+            disable(tunnelType: .openvpn) { _ in
                 self.disable(tunnelType: .wireguard) { _ in
                     self.setup(settings: settings, accessDetails: accessDetails, status: .disconnected) { _ in
                         self.disconnect(tunnelType: .ipsec)
                     }
                 }
             }
         case .openvpn:
-            self.disable(tunnelType: .ipsec) { _ in
+            disable(tunnelType: .ipsec) { _ in
                 self.disable(tunnelType: .wireguard) { _ in
-                    self.setup(settings: settings, accessDetails: accessDetails, status: .disconnected) { _ in
-                        self.disconnect(tunnelType: .openvpn)
-                    }
+                    self.setup(settings: settings, accessDetails: accessDetails, status: .disconnected) { _ in }
                 }
             }
         case .wireguard:
-            self.disable(tunnelType: .ipsec) { _ in
+            disable(tunnelType: .ipsec) { _ in
                 self.disable(tunnelType: .openvpn) { _ in
-                    self.setup(settings: settings, accessDetails: accessDetails, status: .disconnected) { _ in
-                        self.disconnect(tunnelType: .wireguard)
-                    }
+                    self.setup(settings: settings, accessDetails: accessDetails, status: .disconnected) { _ in }
                 }
             }
         }
@@ -272,14 +268,9 @@ class VPNManager {
     }
 
     func disconnect(tunnelType: TunnelType, reconnectAutomatically: Bool = false) {
-        getManagerFor(tunnelType: tunnelType) { manager in
-            DispatchQueue.async {
-                manager.connection.stopVPNTunnel()
-            }
-
-            if !UserDefaults.shared.networkProtectionEnabled || reconnectAutomatically {
-                self.removeOnDemandRule(manager: manager)
-            }
+        getManagerFor(tunnelType: tunnelType) { [self] manager in
+            manager.connection.stopVPNTunnel()
+            removeOnDemandRule(manager: manager)
         }
     }