summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2020-07-22 12:57:49 +0300
committerAndrej Mihajlov <and@mullvad.net>2020-07-22 18:35:43 +0300
commit4724b7e9ec32639b38cb71b97f7cc06a87bc53aa (patch)
treec8f299870f2d57dabdaabfa87b85997111dc3d78
parent166dd2821d9586a592be619c19a7606ec9e6a67b (diff)
downloadmullvadvpn-4724b7e9ec32639b38cb71b97f7cc06a87bc53aa.tar.xz
mullvadvpn-4724b7e9ec32639b38cb71b97f7cc06a87bc53aa.zip
Fix: SimpleTunnelProviderHost
-rw-r--r--ios/MullvadVPN/SimulatorTunnelProviderHost.swift18
1 files changed, 6 insertions, 12 deletions
diff --git a/ios/MullvadVPN/SimulatorTunnelProviderHost.swift b/ios/MullvadVPN/SimulatorTunnelProviderHost.swift
index 5284cd460f..5b85acefa9 100644
--- a/ios/MullvadVPN/SimulatorTunnelProviderHost.swift
+++ b/ios/MullvadVPN/SimulatorTunnelProviderHost.swift
@@ -51,10 +51,10 @@ class SimulatorTunnelProviderHost: SimulatorTunnelProviderDelegate {
case .success(let request):
switch request {
case .reloadTunnelSettings:
- return Self.replyAppMessage(true, completionHandler: completionHandler)
+ Self.replyAppMessage(true, completionHandler: completionHandler)
case .tunnelInformation:
- return Self.replyAppMessage(self.connectionInfo, completionHandler: completionHandler)
+ Self.replyAppMessage(self.connectionInfo, completionHandler: completionHandler)
}
case .failure:
@@ -63,20 +63,14 @@ class SimulatorTunnelProviderHost: SimulatorTunnelProviderDelegate {
}
}
- private static func replyAppMessage<T: Encodable>(
- _ result: Result<T, PacketTunnelProviderError>,
- completionHandler: ((Data?) -> Void)?) {
- let result = result.flatMap { (response) -> Result<Data, PacketTunnelProviderError> in
- return PacketTunnelIpcHandler.encodeResponse(response: response)
- .mapError { PacketTunnelProviderError.ipcHandler($0) }
- }
-
- switch result {
+ private static func replyAppMessage<T: Encodable>(_ response: T, completionHandler: ((Data?) -> Void)?)
+ {
+ switch PacketTunnelIpcHandler.encodeResponse(response: response) {
case .success(let data):
completionHandler?(data)
case .failure(let error):
- error.logChain(log: tunnelProviderLog)
+ error.logChain()
completionHandler?(nil)
}
}