Merge branch 'simulate-overriden-environment-variable-when-running-on-ios-ios-541'

2 files changed, 9 insertions, 0 deletions

diff --git a/ios/MullvadVPNUITests/MullvadApi.swift b/ios/MullvadVPNUITests/MullvadApi.swift
index 6fc8446d3e..3c23f8209d 100644
--- a/ios/MullvadVPNUITests/MullvadApi.swift
+++ b/ios/MullvadVPNUITests/MullvadApi.swift
@@ -32,6 +32,9 @@ struct InitMutableBufferError: Error {
     let description = "Failed to allocate memory for mutable buffer"
 }
 
+/// - Warning: Do not change the `apiAddress` or the `hostname` after the time `MullvadApi.init` has been invoked
+/// The Mullvad API crate is using a global static variable to store those. They will be initialized only once.
+///
 class MullvadApi {
     private var clientContext = MullvadApiClient()
 
diff --git a/mullvad-api/src/ffi/mod.rs b/mullvad-api/src/ffi/mod.rs
index 39b971cf3f..82f96be2d8 100644
--- a/mullvad-api/src/ffi/mod.rs
+++ b/mullvad-api/src/ffi/mod.rs
@@ -68,6 +68,12 @@ impl FfiClient {
             )
         })?;
 
+        // The call site guarantees that
+        // api_hostname and api_address will never change after the first call to new.
+        std::env::set_var(crate::env::API_HOST_VAR, &api_hostname);
+        std::env::set_var(crate::env::API_ADDR_VAR, &addr_str);
+        std::env::set_var(crate::env::API_FORCE_DIRECT_VAR, "0");
+        std::env::set_var(crate::env::DISABLE_TLS_VAR, "0");
         let mut runtime_builder = tokio::runtime::Builder::new_multi_thread();
 
         runtime_builder.worker_threads(2).enable_all();