summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorSteffen <steffen.ernst@mullvad.net>2025-08-25 11:15:04 +0200
committerBug Magnet <marco.nikic@mullvad.net>2025-08-26 10:32:31 +0200
commitd1f81f1f29935e4ef19ca7c5a49818f8ce3af3cd (patch)
tree013117dda71b36f314651d79225deeb6fb4d9f5f
parent9efd32c36cd2337450601ded63c8644ed2d8cc14 (diff)
downloadmullvadvpn-d1f81f1f29935e4ef19ca7c5a49818f8ce3af3cd.tar.xz
mullvadvpn-d1f81f1f29935e4ef19ca7c5a49818f8ce3af3cd.zip
Enable rust api client for all builds
-rw-r--r--ios/MullvadREST/ApiHandlers/RESTProxyFactory.swift15
-rw-r--r--ios/MullvadVPN/AccessMethodRepository/ProxyConfigurationTester.swift15
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() {