feat: update ConnectionSettings.swift

ivpn · Oct 11, 2023 · 2ca3f27 · 2ca3f27
1 parent 9e1293b
commit 2ca3f27
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/IVPNClient/Enums/ConnectionSettings.swift b/IVPNClient/Enums/ConnectionSettings.swift
@@ -60,7 +60,11 @@ enum ConnectionSettings {
             case .udp:
                 return "OpenVPN, UDP"
            }
-        case .wireguard:
+        case .wireguard(_, let port):
+            if UserDefaults.shared.isV2ray {
+                return "WireGuard, \(wireguardProtocol()) \(port)"
+            }
+
             return "WireGuard, \(wireguardProtocol())"
         }
     }
@@ -108,6 +112,26 @@ enum ConnectionSettings {
         }
     }
 
+    func formatProtocolMultiHop() -> String {
+        switch self {
+        case .ipsec:
+            return "IKEv2"
+        case .openvpn(let proto, _):
+            switch proto {
+            case .tcp:
+                return "TCP"
+            case .udp:
+                return "UDP"
+            }
+        case .wireguard(_, let port):
+            if UserDefaults.shared.isV2ray {
+                return "\(wireguardProtocol()) \(port)"
+            }
+
+            return "\(wireguardProtocol())"
+        }
+    }
+
    static func tunnelTypes(protocols: [ConnectionSettings]) -> [ConnectionSettings] {
         var filteredProtocols = [ConnectionSettings]()
 

diff --git a/IVPNClient/Scenes/TableCells/ProtocolTableViewCell.swift b/IVPNClient/Scenes/TableCells/ProtocolTableViewCell.swift
@@ -94,7 +94,7 @@ class ProtocolTableViewCell: UITableViewCell {
 
     private func setupSelectAction(title: String) {
         protocolLabel.text = title
-        protocolSettingsLabel.text = UserDefaults.shared.isMultiHop ? Application.shared.settings.connectionProtocol.protocolType() : Application.shared.settings.connectionProtocol.formatProtocol()
+        protocolSettingsLabel.text = UserDefaults.shared.isMultiHop ? Application.shared.settings.connectionProtocol.formatProtocolMultiHop() : Application.shared.settings.connectionProtocol.formatProtocol()
         accessoryType = .disclosureIndicator
         isUserInteractionEnabled = true
         selectionStyle = .default

diff --git a/IVPNClient/Scenes/ViewControllers/ProtocolViewController.swift b/IVPNClient/Scenes/ViewControllers/ProtocolViewController.swift
@@ -69,7 +69,7 @@ class ProtocolViewController: UITableViewController {
         collection.append(ConnectionSettings.tunnelTypes(protocols: Config.supportedProtocolTypes))
 
         if connectionProtocol.tunnelType() == .wireguard {
-            if UserDefaults.shared.isMultiHop {
+            if UserDefaults.shared.isMultiHop && !UserDefaults.shared.isV2ray {
                 collection.append([.wireguard(.udp, 1), .wireguard(.udp, 2)])
             } else {
                 collection.append([.wireguard(.udp, 0), .wireguard(.udp, 1), .wireguard(.udp, 2)])