From e7a98acf9cd79fb7747e49f33d294bd3f1d46c2d Mon Sep 17 00:00:00 2001 From: Davide De Rosa Date: Fri, 17 Mar 2023 21:16:48 +0100 Subject: [PATCH] Restore generic VPN in TunnelKitVPNManagerStrategy MockVPN was not compiling. Partially revert e17224e61e11c40f13aa686e75f76b874f8691b5 --- .../Managers/TunnelKitVPNManagerStrategy.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PassepartoutLibrary/Sources/PassepartoutVPN/Managers/TunnelKitVPNManagerStrategy.swift b/PassepartoutLibrary/Sources/PassepartoutVPN/Managers/TunnelKitVPNManagerStrategy.swift index d1bd79d8..3bed7c6a 100644 --- a/PassepartoutLibrary/Sources/PassepartoutVPN/Managers/TunnelKitVPNManagerStrategy.swift +++ b/PassepartoutLibrary/Sources/PassepartoutVPN/Managers/TunnelKitVPNManagerStrategy.swift @@ -32,7 +32,7 @@ import TunnelKitOpenVPNCore import PassepartoutCore import PassepartoutUtils -public class TunnelKitVPNManagerStrategy: VPNManagerStrategy { +public class TunnelKitVPNManagerStrategy: VPNManagerStrategy where VPNType.Configuration == NetworkExtensionConfiguration, VPNType.Extra == NetworkExtensionExtra { private struct AtomicState: Equatable { let isEnabled: Bool @@ -52,7 +52,7 @@ public class TunnelKitVPNManagerStrategy: VPNManagerStrategy { private let defaults: UserDefaults - private let vpn: NetworkExtensionVPN + private let vpn: VPNType private let dataCountInterval: TimeInterval @@ -73,7 +73,7 @@ public class TunnelKitVPNManagerStrategy: VPNManagerStrategy { public init( appGroup: String, tunnelBundleIdentifier: @escaping (VPNProtocolType) -> String, - vpn: NetworkExtensionVPN, + vpn: VPNType, dataCountInterval: TimeInterval = 3.0 ) { self.appGroup = appGroup