feat: update UserDefaults+Ext.swift

ivpn · Sep 22, 2023 · 5ffc441 · 5ffc441
1 parent 0891041
commit 5ffc441
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/IVPNClient/Managers/ConnectionManager.swift b/IVPNClient/Managers/ConnectionManager.swift
@@ -101,7 +101,7 @@ class ConnectionManager {
                     }
                 }
                 DispatchQueue.delay(2.5) {
-                    if V2RayCore.shared.isV2ray && !V2RayCore.shared.reconnectWithV2ray {
+                    if UserDefaults.shared.isV2ray && !V2RayCore.shared.reconnectWithV2ray {
                         V2RayCore.shared.reconnectWithV2ray = true
                         self.reconnect()
                     } else {
@@ -255,7 +255,7 @@ class ConnectionManager {
                 return
             }
 
-            if V2RayCore.shared.isV2ray && V2RayCore.shared.reconnectWithV2ray {
+            if UserDefaults.shared.isV2ray && V2RayCore.shared.reconnectWithV2ray {
                 DispatchQueue.global(qos: .userInitiated).async {
                     let error = V2RayCore.shared.start()
                     if error != nil {
@@ -287,7 +287,7 @@ class ConnectionManager {
             }
         }
 
-        if V2RayCore.shared.isV2ray {
+        if UserDefaults.shared.isV2ray {
             DispatchQueue.global(qos: .userInitiated).async {
                 let error = V2RayCore.shared.close()
                 if error != nil {

diff --git a/IVPNClient/Models/V2Ray/V2RayCore.swift b/IVPNClient/Models/V2Ray/V2RayCore.swift
@@ -30,7 +30,6 @@ class V2RayCore {
 
     static let shared = V2RayCore()
     var instance: V2rayControlInstance?
-    var isV2ray = true
     var reconnectWithV2ray = false
 
     // MARK: - Methods -

diff --git a/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift b/IVPNClient/Utilities/Extensions/NETunnelProviderProtocol+Ext.swift
@@ -146,7 +146,7 @@ extension NETunnelProviderProtocol {
             KeyChain.wgIpv6Host = ipv6.localIP
         }
 
-        if V2RayCore.shared.isV2ray && V2RayCore.shared.reconnectWithV2ray {
+        if UserDefaults.shared.isV2ray && V2RayCore.shared.reconnectWithV2ray {
             endpoint = Peer.endpoint(host: Config.v2rayHost, port: Config.v2rayPort)
             v2raySettings?.inboundIp = v2rayInboundIp
             v2raySettings?.inboundPort = v2rayInboundPort

diff --git a/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift b/IVPNClient/Utilities/Extensions/UserDefaults+Ext.swift
@@ -91,6 +91,8 @@ extension UserDefaults {
         static let antiTrackerDns = "antiTrackerDns"
         static let disableLanAccess = "disableLanAccess"
         static let v2raySettings = "v2raySettings"
+        static let v2rayProtocol = "v2rayProtocol"
+        static let isV2ray = "isV2ray"
     }
 
     @objc dynamic var wireguardTunnelProviderError: String {
@@ -241,6 +243,14 @@ extension UserDefaults {
         return bool(forKey: Key.disableLanAccess)
     }
 
+    @objc dynamic var v2rayProtocol: String {
+        return string(forKey: Key.v2rayProtocol) ?? ""
+    }
+
+    @objc dynamic var isV2ray: Bool {
+        return bool(forKey: Key.isV2ray)
+    }
+
     static func registerUserDefaults() {
         shared.register(defaults: [Key.networkProtectionUntrustedConnect: true])
         shared.register(defaults: [Key.networkProtectionTrustedDisconnect: true])
@@ -278,6 +288,8 @@ extension UserDefaults {
         shared.removeObject(forKey: Key.antiTrackerDns)
         shared.removeObject(forKey: Key.disableLanAccess)
         shared.removeObject(forKey: Key.v2raySettings)
+        shared.removeObject(forKey: Key.v2rayProtocol)
+        shared.removeObject(forKey: Key.isV2ray)
         standard.removeObject(forKey: Key.serviceStatus)
         standard.removeObject(forKey: Key.selectedHost)
         standard.removeObject(forKey: Key.selectedExitHost)