Merge branch 'android-api-override'

2 files changed, 19 insertions, 2 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/ApiEndpoint.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/ApiEndpoint.kt
new file mode 100644
index 0000000000..df40bfac4d
--- /dev/null
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/model/ApiEndpoint.kt
@@ -0,0 +1,13 @@
+package net.mullvad.mullvadvpn.model
+
+import android.os.Parcelable
+import java.net.InetSocketAddress
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class ApiEndpoint(
+    val address: InetSocketAddress,
+    val disableAddressCache: Boolean,
+    val disableTls: Boolean,
+    val forceDirectConnection: Boolean
+) : Parcelable
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
index 8d983ad883..aac23cee25 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadDaemon.kt
@@ -2,6 +2,7 @@ package net.mullvad.mullvadvpn.service
 
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.asSharedFlow
+import net.mullvad.mullvadvpn.model.ApiEndpoint
 import net.mullvad.mullvadvpn.model.AppVersionInfo
 import net.mullvad.mullvadvpn.model.Device
 import net.mullvad.mullvadvpn.model.DeviceEvent
@@ -38,7 +39,9 @@ class MullvadDaemon(vpnService: MullvadVpnService) {
 
     init {
         System.loadLibrary("mullvad_jni")
-        initialize(vpnService, vpnService.cacheDir.absolutePath, vpnService.filesDir.absolutePath)
+        initialize(
+            vpnService, vpnService.cacheDir.absolutePath, vpnService.filesDir.absolutePath, null
+        )
 
         onSettingsChange.notify(getSettings())
 
@@ -176,7 +179,8 @@ class MullvadDaemon(vpnService: MullvadVpnService) {
     private external fun initialize(
         vpnService: MullvadVpnService,
         cacheDirectory: String,
-        resourceDirectory: String
+        resourceDirectory: String,
+        apiEndpoint: ApiEndpoint?
     )
 
     private external fun deinitialize()