Synchronize `mullvad-api` and `mullvad-daemon` when the `api-override`

feature is enabled

Move the logic for using overridden API endpoints for API calls from
`mullvad-api::rest` to `mullvad_daemon::api`. This is in line with how
the interaction between the two crates work for a normal release build,
i.e. when the `api-override` feature is disabled.

This commit also removes references to `force_direct_connection` in the
Android code. The flag does not exist in the `mullvad-*` rust crates
anymore, so it would be erroneous to try to serialize/deserialize the
value from the Android client.

1 files changed, 3 insertions, 3 deletions

diff --git a/test/test-manager/src/tests/account.rs b/test/test-manager/src/tests/account.rs
index 8b30f85768..d30d0330f0 100644
--- a/test/test-manager/src/tests/account.rs
+++ b/test/test-manager/src/tests/account.rs
@@ -221,7 +221,7 @@ pub async fn new_device_client() -> DevicesProxy {
     let api_endpoint = mullvad_api::ApiEndpoint::from_env_vars();
 
     let api_host = format!("api.{}", TEST_CONFIG.mullvad_host);
-    let api_addr = format!("{api_host}:443")
+    let api_address = format!("{api_host}:443")
         .to_socket_addrs()
         .expect("failed to resolve API host")
         .next()
@@ -229,8 +229,8 @@ pub async fn new_device_client() -> DevicesProxy {
 
     // Override the API endpoint to use the one specified in the test config
     let _ = mullvad_api::API.override_init(mullvad_api::ApiEndpoint {
-        host: api_host,
-        addr: api_addr,
+        host: Some(api_host),
+        address: Some(api_address),
         ..api_endpoint
     });