Re enable extensions on NetworkExtension types that were accidentally…

… removed
mullvad · Sep 11, 2023 · d4b5cd4 · d4b5cd4
1 parent 4d28de5
commit d4b5cd4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 21 deletions.
diff --git a/ios/MullvadVPN/SimulatorTunnelProvider/SimulatorTunnelProvider.swift b/ios/MullvadVPN/SimulatorTunnelProvider/SimulatorTunnelProvider.swift
@@ -11,27 +11,6 @@ import NetworkExtension
 
 #if targetEnvironment(simulator)
 
-protocol VPNTunnelProviderManagerProtocol: Equatable {
-    associatedtype SelfType: VPNTunnelProviderManagerProtocol
-    associatedtype ConnectionType: VPNConnectionProtocol
-
-    var isEnabled: Bool { get set }
-    var protocolConfiguration: NEVPNProtocol? { get set }
-    var localizedDescription: String? { get set }
-    var connection: ConnectionType { get }
-
-    init()
-
-    func loadFromPreferences(completionHandler: @escaping (Error?) -> Void)
-    func saveToPreferences(completionHandler: ((Error?) -> Void)?)
-    func removeFromPreferences(completionHandler: ((Error?) -> Void)?)
-
-    static func loadAllFromPreferences(completionHandler: @escaping ([SelfType]?, Error?) -> Void)
-}
-
-extension NEVPNConnection: VPNConnectionProtocol {}
-extension NETunnelProviderSession: VPNTunnelProviderSessionProtocol {}
-extension NETunnelProviderManager: VPNTunnelProviderManagerProtocol {}
 
 class SimulatorTunnelProviderDelegate {
     var connection: SimulatorVPNConnection?

diff --git a/ios/MullvadVPN/TunnelManager/VPNConnectionProtocol.swift b/ios/MullvadVPN/TunnelManager/VPNConnectionProtocol.swift
@@ -9,6 +9,24 @@
 import Foundation
 import NetworkExtension
 
+protocol VPNTunnelProviderManagerProtocol: Equatable {
+    associatedtype SelfType: VPNTunnelProviderManagerProtocol
+    associatedtype ConnectionType: VPNConnectionProtocol
+
+    var isEnabled: Bool { get set }
+    var protocolConfiguration: NEVPNProtocol? { get set }
+    var localizedDescription: String? { get set }
+    var connection: ConnectionType { get }
+
+    init()
+
+    func loadFromPreferences(completionHandler: @escaping (Error?) -> Void)
+    func saveToPreferences(completionHandler: ((Error?) -> Void)?)
+    func removeFromPreferences(completionHandler: ((Error?) -> Void)?)
+
+    static func loadAllFromPreferences(completionHandler: @escaping ([SelfType]?, Error?) -> Void)
+}
+
 protocol VPNConnectionProtocol: NSObject {
     var status: NEVPNStatus { get }
     var connectedDate: Date? { get }
@@ -21,3 +39,7 @@ protocol VPNConnectionProtocol: NSObject {
 protocol VPNTunnelProviderSessionProtocol {
     func sendProviderMessage(_ messageData: Data, responseHandler: ((Data?) -> Void)?) throws
 }
+
+extension NEVPNConnection: VPNConnectionProtocol {}
+extension NETunnelProviderSession: VPNTunnelProviderSessionProtocol {}
+extension NETunnelProviderManager: VPNTunnelProviderManagerProtocol {}