diff options
Diffstat (limited to 'ios/MullvadREST/MullvadAPI')
| -rw-r--r-- | ios/MullvadREST/MullvadAPI/APIHandlers/MullvadAPIProxy.swift | 2 | ||||
| -rw-r--r-- | ios/MullvadREST/MullvadAPI/MullvadApiRequestFactory.swift | 38 |
2 files changed, 10 insertions, 30 deletions
diff --git a/ios/MullvadREST/MullvadAPI/APIHandlers/MullvadAPIProxy.swift b/ios/MullvadREST/MullvadAPI/APIHandlers/MullvadAPIProxy.swift index 5d2555f07f..4350161a3a 100644 --- a/ios/MullvadREST/MullvadAPI/APIHandlers/MullvadAPIProxy.swift +++ b/ios/MullvadREST/MullvadAPI/APIHandlers/MullvadAPIProxy.swift @@ -201,7 +201,7 @@ extension REST { let newExpiry: Date } - public struct ProblemReportRequest: Encodable, Sendable { + public struct ProblemReportRequest: Codable, Sendable { public let address: String public let message: String public let log: String diff --git a/ios/MullvadREST/MullvadAPI/MullvadApiRequestFactory.swift b/ios/MullvadREST/MullvadAPI/MullvadApiRequestFactory.swift index 970f70ef76..647b1b71be 100644 --- a/ios/MullvadREST/MullvadAPI/MullvadApiRequestFactory.swift +++ b/ios/MullvadREST/MullvadAPI/MullvadApiRequestFactory.swift @@ -24,43 +24,44 @@ public struct MullvadApiRequestFactory: Sendable { let rawCompletionPointer = Unmanaged.passRetained(completionPointer).toOpaque() - return switch request { + switch request { case let .getAddressList(retryStrategy): - MullvadApiCancellable(handle: mullvad_api_get_addresses( + return MullvadApiCancellable(handle: mullvad_api_get_addresses( apiContext.context, rawCompletionPointer, retryStrategy.toRustStrategy() )) case let .getRelayList(retryStrategy, etag: etag): - MullvadApiCancellable(handle: mullvad_api_get_relays( + return MullvadApiCancellable(handle: mullvad_api_get_relays( apiContext.context, rawCompletionPointer, retryStrategy.toRustStrategy(), etag )) case let .sendProblemReport(retryStrategy, problemReportRequest): - MullvadApiCancellable(handle: mullvad_api_send_problem_report( + let rustRequest = RustProblemReportRequest(from: problemReportRequest) + return MullvadApiCancellable(handle: mullvad_api_send_problem_report( apiContext.context, rawCompletionPointer, retryStrategy.toRustStrategy(), - problemReportRequest.toRust() + rustRequest.toRust() )) case let .getAccount(retryStrategy, accountNumber: accountNumber): - MullvadApiCancellable(handle: mullvad_api_get_account( + return MullvadApiCancellable(handle: mullvad_api_get_account( apiContext.context, rawCompletionPointer, retryStrategy.toRustStrategy(), accountNumber )) case let .createAccount(retryStrategy): - MullvadApiCancellable(handle: mullvad_api_create_account( + return MullvadApiCancellable(handle: mullvad_api_create_account( apiContext.context, rawCompletionPointer, retryStrategy.toRustStrategy() )) case let .deleteAccount(retryStrategy, accountNumber: accountNumber): - MullvadApiCancellable(handle: mullvad_api_delete_account( + return MullvadApiCancellable(handle: mullvad_api_delete_account( apiContext.context, rawCompletionPointer, retryStrategy.toRustStrategy(), @@ -74,24 +75,3 @@ public struct MullvadApiRequestFactory: Sendable { extension REST { public typealias MullvadApiRequestHandler = (((MullvadApiResponse) throws -> Void)?) -> MullvadApiCancellable } - -private extension REST.ProblemReportRequest { - func toRust() -> UnsafePointer<SwiftProblemReportRequest> { - let structPointer = UnsafeMutablePointer<SwiftProblemReportRequest>.allocate(capacity: 1) - - let addressPointer = address.toUnsafePointer() - let messagePointer = message.toUnsafePointer() - let logPointer = log.toUnsafePointer() - - structPointer.initialize(to: SwiftProblemReportRequest( - address: addressPointer, - address_len: UInt(address.utf8.count), - message: messagePointer, - message_len: UInt(message.utf8.count), - log: logPointer, - log_len: UInt(log.utf8.count) - )) - - return UnsafePointer(structPointer) - } -} |