diff options
| -rw-r--r-- | ios/MullvadREST/ApiHandlers/RESTProxyFactory.swift | 15 | ||||
| -rw-r--r-- | ios/MullvadVPN/AccessMethodRepository/ProxyConfigurationTester.swift | 15 |
2 files changed, 0 insertions, 30 deletions
diff --git a/ios/MullvadREST/ApiHandlers/RESTProxyFactory.swift b/ios/MullvadREST/ApiHandlers/RESTProxyFactory.swift index 4d6f5eaa02..0de6d8b2a6 100644 --- a/ios/MullvadREST/ApiHandlers/RESTProxyFactory.swift +++ b/ios/MullvadREST/ApiHandlers/RESTProxyFactory.swift @@ -58,42 +58,27 @@ extension REST { } public func createAPIProxy() -> APIQuerying { - #if DEBUG MullvadAPIProxy( transportProvider: configuration.apiTransportProvider, dispatchQueue: DispatchQueue(label: "MullvadAPIProxy.dispatchQueue"), responseDecoder: Coding.makeJSONDecoder() ) - - #else - REST.APIProxy(configuration: configuration) - #endif } public func createAccountsProxy() -> RESTAccountHandling { - #if DEBUG MullvadAccountProxy( transportProvider: configuration.apiTransportProvider, dispatchQueue: DispatchQueue(label: "MullvadAccountProxy.dispatchQueue"), responseDecoder: Coding.makeJSONDecoder() ) - - #else - REST.AccountsProxy(configuration: configuration) - #endif } public func createDevicesProxy() -> DeviceHandling { - #if DEBUG MullvadDeviceProxy( transportProvider: configuration.apiTransportProvider, dispatchQueue: DispatchQueue(label: "MullvadDeviceProxy.dispatchQueue"), responseDecoder: Coding.makeJSONDecoder() ) - - #else - REST.DevicesProxy(configuration: configuration) - #endif } } } diff --git a/ios/MullvadVPN/AccessMethodRepository/ProxyConfigurationTester.swift b/ios/MullvadVPN/AccessMethodRepository/ProxyConfigurationTester.swift index 8e194bd74b..d660723329 100644 --- a/ios/MullvadVPN/AccessMethodRepository/ProxyConfigurationTester.swift +++ b/ios/MullvadVPN/AccessMethodRepository/ProxyConfigurationTester.swift @@ -25,27 +25,12 @@ class ProxyConfigurationTester: ProxyConfigurationTesterProtocol { } func start(configuration: PersistentAccessMethod, completion: @escaping @Sendable (Error?) -> Void) { - #if DEBUG cancellable = apiProxy.checkApiAvailability(retryStrategy: .noRetry, accessMethod: configuration) { success in switch success { case .success: completion(nil) case let .failure(error): completion(error) } } - #else - do { - let transport = try transportProvider.makeTransport(with: configuration.proxyConfiguration) - let request = REST.APIAvailabilityTestRequest(transport: transport) - headRequest = request - cancellable = request.makeRequest { error in - DispatchQueue.main.async { - completion(error) - } - } - } catch { - completion(error) - } - #endif } func cancel() { |