feat: update supportedProtocols method in ConnectionSettings.swift

ivpn · Nov 2, 2023 · fe1aaad · fe1aaad
1 parent 76136c9
commit fe1aaad
Showing 1 changed file with 23 additions and 1 deletion.
diff --git a/IVPNClient/Enums/ConnectionSettings.swift b/IVPNClient/Enums/ConnectionSettings.swift
@@ -154,7 +154,13 @@ enum ConnectionSettings {
         var filteredProtocols = [ConnectionSettings]()
 
         for protocolObj in protocols where protocolObj.tunnelType() == self.tunnelType() {
-            filteredProtocols.append(protocolObj)
+            if UserDefaults.shared.isV2ray && tunnelType() == .wireguard && UserDefaults.shared.v2rayProtocol == protocolObj.storedProtocolType().lowercased() {
+                if UserDefaults.shared.v2rayProtocol == protocolObj.storedProtocolType().lowercased() {
+                    filteredProtocols.append(protocolObj)
+                }
+            } else {
+                filteredProtocols.append(protocolObj)
+            }
         }
 
         return filteredProtocols
@@ -255,6 +261,22 @@ enum ConnectionSettings {
         }
     }
 
+    func storedProtocolType() -> String {
+        switch self {
+        case .ipsec:
+            return "IKEv2"
+        case .openvpn(let proto, _):
+            switch proto {
+            case .tcp:
+                return "TCP"
+            case .udp:
+                return "UDP"
+            }
+        case .wireguard:
+            return "UDP"
+        }
+    }
+
     func wireguardProtocol() -> String {
         if UserDefaults.shared.isV2ray && UserDefaults.shared.v2rayProtocol == "tcp" {
             return "TCP"