Make the code more concise/idiomatic/better organised

2 files changed, 5 insertions, 17 deletions

diff --git a/ios/MullvadRustRuntime/MullvadApiContext.swift b/ios/MullvadRustRuntime/MullvadApiContext.swift
index bd89ab891f..7600b79e70 100644
--- a/ios/MullvadRustRuntime/MullvadApiContext.swift
+++ b/ios/MullvadRustRuntime/MullvadApiContext.swift
@@ -9,7 +9,7 @@
 import MullvadTypes
 
 public struct MullvadApiContext: @unchecked Sendable {
-    enum MullvadApiContextError: Error {
+    enum Error: Swift.Error {
         case failedToConstructApiClient
     }
 
@@ -58,7 +58,7 @@ public struct MullvadApiContext: @unchecked Sendable {
         }
 
         if context._0 == nil {
-            throw MullvadApiContextError.failedToConstructApiClient
+            throw Error.failedToConstructApiClient
         }
     }
 }
diff --git a/ios/MullvadRustRuntime/MullvadApiResponse.swift b/ios/MullvadRustRuntime/MullvadApiResponse.swift
index ddead026b3..597de40b75 100644
--- a/ios/MullvadRustRuntime/MullvadApiResponse.swift
+++ b/ios/MullvadRustRuntime/MullvadApiResponse.swift
@@ -26,19 +26,11 @@ public class MullvadApiResponse {
     }
 
     public var etag: String? {
-        return if response.etag == nil {
-            nil
-        } else {
-            String(cString: response.etag)
-        }
+        response.etag.map { String(cString: $0) }
     }
 
     public var errorDescription: String? {
-        return if response.error_description == nil {
-            nil
-        } else {
-            String(cString: response.error_description)
-        }
+        response.error_description.map { String(cString: $0) }
     }
 
     public var statusCode: UInt16 {
@@ -46,11 +38,7 @@ public class MullvadApiResponse {
     }
 
     public var serverResponseCode: String? {
-        return if response.server_response_code == nil {
-            nil
-        } else {
-            String(cString: response.server_response_code)
-        }
+        response.server_response_code.map { String(cString: $0) }
     }
 
     public var success: Bool {