summaryrefslogtreecommitdiffhomepage
path: root/android/test/mockapi/src
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2024-01-09 10:41:08 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2024-01-11 09:18:26 +0100
commit8b0fd0d971e67df8415da1bdac558e366bfd7290 (patch)
treee6b51f09eb39ca4a343c9d21880accb2903122f3 /android/test/mockapi/src
parent75eb89c820f12d488a76934f59ba29fe999cf59c (diff)
downloadmullvadvpn-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 'android/test/mockapi/src')
-rw-r--r--android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt3
1 files changed, 1 insertions, 2 deletions
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt
index f699b3cadc..702aa72db4 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt
@@ -59,8 +59,7 @@ abstract class MockApiTest {
InetAddress.getLocalHost().hostName,
port,
disableAddressCache = true,
- disableTls = true,
- forceDirectConnection = true
+ disableTls = true
)
}
}