feat: update PortViewController.swift

ivpn · Nov 2, 2023 · 9d9d58c · 9d9d58c
1 parent fe1aaad
commit 9d9d58c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 26 deletions.
diff --git a/IVPNClient/Enums/ConnectionSettings.swift b/IVPNClient/Enums/ConnectionSettings.swift
@@ -154,13 +154,7 @@ enum ConnectionSettings {
         var filteredProtocols = [ConnectionSettings]()
 
         for protocolObj in protocols where protocolObj.tunnelType() == self.tunnelType() {
-            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)
-            }
+            filteredProtocols.append(protocolObj)
         }
 
         return filteredProtocols
@@ -261,22 +255,6 @@ 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"

diff --git a/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift b/IVPNClient/Scenes/ViewControllers/AdvancedViewController.swift
@@ -42,7 +42,7 @@ class AdvancedViewController: UITableViewController {
     // MARK: - Properties -
 
     var protocolType: String {
-        return v2rayProtocolControl.selectedSegmentIndex == 1 ? "tcp" : "quic"
+        return v2rayProtocolControl.selectedSegmentIndex == 1 ? "tcp" : "udp"
     }
 
     // MARK: - @IBActions -
@@ -73,7 +73,7 @@ class AdvancedViewController: UITableViewController {
     }
 
     @IBAction func selectV2rayProtocol(_ sender: UISegmentedControl) {
-        let v2rayProtocol = sender.selectedSegmentIndex == 1 ? "tcp" : "quic"
+        let v2rayProtocol = sender.selectedSegmentIndex == 1 ? "tcp" : "udp"
         UserDefaults.shared.set(v2rayProtocol, forKey: UserDefaults.Key.v2rayProtocol)
 
         if UserDefaults.shared.isV2ray {

diff --git a/IVPNClient/Scenes/ViewControllers/PortViewController.swift b/IVPNClient/Scenes/ViewControllers/PortViewController.swift
@@ -41,6 +41,10 @@ class PortViewController: UITableViewController {
         var ports = [ConnectionSettings]()
         if let storedCustomPorts = StorageManager.fetchCustomPorts(vpnProtocol: selectedPort.formatTitle().lowercased()) {
             for customPort in storedCustomPorts {
+                if UserDefaults.shared.isV2ray && Application.shared.settings.connectionProtocol.tunnelType() == .wireguard && UserDefaults.shared.v2rayProtocol != customPort.type {
+                    continue
+                }
+
                 let string = "\(customPort.vpnProtocol ?? "")-\(customPort.type ?? "")-\(customPort.port)"
                 ports.append(ConnectionSettings.getFrom(portString: string))
             }

diff --git a/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift b/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift
@@ -244,7 +244,7 @@ extension UserDefaults {
     }
 
     @objc dynamic var v2rayProtocol: String {
-        return string(forKey: Key.v2rayProtocol) ?? "quic"
+        return string(forKey: Key.v2rayProtocol) ?? "udp"
     }
 
     @objc dynamic var isV2ray: Bool {