diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2022-11-04 10:01:33 +0100 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2022-11-07 12:46:51 +0100 |
| commit | 4123b3655712271d5606748bd2c5a32ce096b803 (patch) | |
| tree | 76060d8d602e829e7f25a45f65f336a424e78bba | |
| parent | a927663fff9c85077604af08874df11b994820c2 (diff) | |
| download | mullvadvpn-4123b3655712271d5606748bd2c5a32ce096b803.tar.xz mullvadvpn-4123b3655712271d5606748bd2c5a32ce096b803.zip | |
Add URLSessionTransport into REST namespace
| -rw-r--r-- | ios/MullvadREST/URLSessionTransport.swift | 32 | ||||
| -rw-r--r-- | ios/MullvadVPN/TransportMonitor/TransportMonitor.swift | 4 |
2 files changed, 19 insertions, 17 deletions
diff --git a/ios/MullvadREST/URLSessionTransport.swift b/ios/MullvadREST/URLSessionTransport.swift index f8bd4cca24..4acc155d58 100644 --- a/ios/MullvadREST/URLSessionTransport.swift +++ b/ios/MullvadREST/URLSessionTransport.swift @@ -11,23 +11,25 @@ import MullvadTypes extension URLSessionTask: Cancellable {} -public final class URLSessionTransport: RESTTransport { - public var name: String { - return "url-session" - } +extension REST { + public final class URLSessionTransport: RESTTransport { + public var name: String { + return "url-session" + } - public let urlSession: URLSession + public let urlSession: URLSession - public init(urlSession: URLSession) { - self.urlSession = urlSession - } + public init(urlSession: URLSession) { + self.urlSession = urlSession + } - public func sendRequest( - _ request: URLRequest, - completion: @escaping (Data?, URLResponse?, Error?) -> Void - ) throws -> Cancellable { - let dataTask = urlSession.dataTask(with: request, completionHandler: completion) - dataTask.resume() - return dataTask + public func sendRequest( + _ request: URLRequest, + completion: @escaping (Data?, URLResponse?, Swift.Error?) -> Void + ) throws -> Cancellable { + let dataTask = urlSession.dataTask(with: request, completionHandler: completion) + dataTask.resume() + return dataTask + } } } diff --git a/ios/MullvadVPN/TransportMonitor/TransportMonitor.swift b/ios/MullvadVPN/TransportMonitor/TransportMonitor.swift index 140a9b3027..7b0e49f70b 100644 --- a/ios/MullvadVPN/TransportMonitor/TransportMonitor.swift +++ b/ios/MullvadVPN/TransportMonitor/TransportMonitor.swift @@ -12,13 +12,13 @@ import MullvadREST class TransportMonitor: TunnelObserver { private let tunnelManager: TunnelManager private let packetTunnelTransport: PacketTunnelTransport - private let urlSessionTransport: URLSessionTransport + private let urlSessionTransport: REST.URLSessionTransport init(tunnelManager: TunnelManager = .shared) { self.tunnelManager = tunnelManager packetTunnelTransport = PacketTunnelTransport(tunnelManager: tunnelManager) - urlSessionTransport = URLSessionTransport(urlSession: REST.makeURLSession()) + urlSessionTransport = REST.URLSessionTransport(urlSession: REST.makeURLSession()) tunnelManager.addObserver(self) |