fixup! Remove global API endpoint

mullvad · Dec 19, 2024 · 64197ae · 64197ae
1 parent 9b9adc7
commit 64197ae
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/ios/MullvadVPNUITests/MullvadApi.swift b/ios/MullvadVPNUITests/MullvadApi.swift
@@ -56,7 +56,8 @@ class MullvadApi {
         let result = mullvad_api_client_initialize(
             &clientContext,
             apiAddress,
-            hostname
+            hostname,
+            false
         )
         try ApiError(result).throwIfErr()
     }

diff --git a/mullvad-api/src/ffi/mod.rs b/mullvad-api/src/ffi/mod.rs
@@ -236,13 +236,19 @@ impl FfiClient {
 ///
 /// * `hostname`: pointer to a null-terminated UTF-8 string representing the hostname that will be
 ///   used for TLS validation.
+/// * `disable_tls`: only valid when built for tests, can be ignored when consumed by Swift.
 #[no_mangle]
 pub unsafe extern "C" fn mullvad_api_client_initialize(
     client_ptr: *mut MullvadApiClient,
     api_address_ptr: *const libc::c_char,
     hostname: *const libc::c_char,
-    #[cfg(any(feature = "api-override", test))] disable_tls: bool,
+    disable_tls: bool,
 ) -> MullvadApiError {
+    #[cfg(not(any(feature = "api-override", test)))]
+    if disable_tls {
+        log::error!("disable_tls has no effect when mullvad-api is built without api-override");
+    }
+
     match unsafe {
         FfiClient::new(
             api_address_ptr,