feat: update ConnectionInfoViewModel

ivpn · Oct 23, 2023 · 84627e2 · 84627e2
1 parent 862555e
commit 84627e2
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 7 deletions.
diff --git a/IVPNWidget/Scene/ConnectionInfo/ConnectionInfo.swift b/IVPNWidget/Scene/ConnectionInfo/ConnectionInfo.swift
@@ -28,4 +28,6 @@ struct ConnectionInfo {
     var multiHop: Bool
     var selectedProtocol: String
     var geoLookup: GeoLookup
+    var isV2ray: Bool
+    var v2rayProtocol: String
 }
diff --git a/IVPNWidget/Scene/ConnectionInfo/ConnectionInfoViewModel.swift b/IVPNWidget/Scene/ConnectionInfo/ConnectionInfoViewModel.swift
@@ -64,9 +64,18 @@ extension ConnectionInfoView {
             var port = 0
             let components = model.selectedProtocol.components(separatedBy: "-")
 
+            if let protocolType = components[safeIndex: 1] {
+                proto = protocolType.uppercased()
+            }
+
+            if let protocolPort = components[safeIndex: 2] {
+                port = Int(protocolPort) ?? 0
+            }
+
             if let protocolName = components[safeIndex: 0] {
                 if protocolName == "wireguard" {
                     name = "WireGuard"
+                    proto = wireguardProtocol()
                 }
                 if protocolName == "openvpn" {
                     name = "OpenVPN"
@@ -75,12 +84,6 @@ extension ConnectionInfoView {
                     return "IKEv2"
                 }
             }
-            if let protocolType = components[safeIndex: 1] {
-                proto = protocolType.uppercased()
-            }
-            if let protocolPort = components[safeIndex: 2] {
-                port = Int(protocolPort) ?? 0
-            }
 
             if model.multiHop {
                 return "\(name), \(proto)"
@@ -93,5 +96,13 @@ extension ConnectionInfoView {
             return model.antiTracker ? "ON" : "OFF"
         }
 
+        func wireguardProtocol() -> String {
+            if model.isV2ray && model.v2rayProtocol == "tcp" {
+                return "TCP"
+            }
+
+            return "UDP"
+        }
+
     }
 }
diff --git a/IVPNWidget/Service/DataService.swift b/IVPNWidget/Service/DataService.swift
@@ -49,7 +49,14 @@ class WidgetDataService: DataService {
     }
 
     func getConnectionInfo() -> ConnectionInfo {
-        return ConnectionInfo(antiTracker: getAntiTracker(), multiHop: getMultiHop(), selectedProtocol: getProtocol(), geoLookup: getLocation())
+        return ConnectionInfo(
+            antiTracker: getAntiTracker(),
+            multiHop: getMultiHop(),
+            selectedProtocol: getProtocol(),
+            geoLookup: getLocation(),
+            isV2ray: getIsV2ray(),
+            v2rayProtocol: getV2rayProtocol()
+        )
     }
 
     func getAntiTracker() -> Bool {
@@ -64,4 +71,12 @@ class WidgetDataService: DataService {
         return UserDefaults.shared.selectedProtocol
     }
 
+    func getIsV2ray() -> Bool {
+        return UserDefaults.shared.isV2ray
+    }
+
+    func getV2rayProtocol() -> String {
+        return UserDefaults.shared.v2rayProtocol
+    }
+
 }