diff options
| author | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-01-09 10:41:08 +0100 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-01-11 09:18:26 +0100 |
| commit | 8b0fd0d971e67df8415da1bdac558e366bfd7290 (patch) | |
| tree | e6b51f09eb39ca4a343c9d21880accb2903122f3 /mullvad-api/src/access.rs | |
| parent | 75eb89c820f12d488a76934f59ba29fe999cf59c (diff) | |
| download | mullvadvpn-8b0fd0d971e67df8415da1bdac558e366bfd7290.tar.xz mullvadvpn-8b0fd0d971e67df8415da1bdac558e366bfd7290.zip | |
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.
Diffstat (limited to 'mullvad-api/src/access.rs')
| -rw-r--r-- | mullvad-api/src/access.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mullvad-api/src/access.rs b/mullvad-api/src/access.rs index 276cc1f561..569c01f085 100644 --- a/mullvad-api/src/access.rs +++ b/mullvad-api/src/access.rs @@ -38,7 +38,7 @@ struct AccountState { impl AccessTokenStore { pub(crate) fn new(service: RequestServiceHandle) -> Self { - let factory = rest::RequestFactory::new(&API.host, None); + let factory = rest::RequestFactory::new(API.host(), None); let (tx, rx) = mpsc::unbounded(); tokio::spawn(Self::service_requests(rx, service, factory)); Self { tx } |