Initialize mullvad daemon directly in vpn service on create

As a consequence move the address resolve to the daemon

7 files changed, 23 insertions, 52 deletions

diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/DiConstant.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/DiConstant.kt
index 0acd41c7ec..9fac18a479 100644
--- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/DiConstant.kt
+++ b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/DiConstant.kt
@@ -1,3 +1,5 @@
 package net.mullvad.mullvadvpn.lib.common.constant
 
 const val GRPC_SOCKET_FILE_NAMED_ARGUMENT = "RPC_SOCKET"
+const val FILES_DIR_NAMED_ARGUMENT = "FILES_DIR"
+const val CACHE_DIR_NAMED_ARGUMENT = "CACHE_DIR"
diff --git a/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpoint.kt b/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpoint.kt
deleted file mode 100644
index 1fd26bddae..0000000000
--- a/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpoint.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package net.mullvad.mullvadvpn.lib.endpoint
-
-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,
-) : Parcelable
diff --git a/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointConfiguration.kt b/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointConfiguration.kt
deleted file mode 100644
index 164a9fffa7..0000000000
--- a/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointConfiguration.kt
+++ /dev/null
@@ -1,7 +0,0 @@
-package net.mullvad.mullvadvpn.lib.endpoint
-
-import android.os.Parcelable
-
-interface ApiEndpointConfiguration : Parcelable {
-    fun apiEndpoint(): ApiEndpoint?
-}
diff --git a/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointIntentExtensions.kt b/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointIntentExtensions.kt
index cf2f2fb0dd..9e46c5dda8 100644
--- a/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointIntentExtensions.kt
+++ b/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointIntentExtensions.kt
@@ -5,13 +5,13 @@ import android.os.Build
 
 private const val OVERRIDE_API_EXTRA_NAME = "override_api"
 
-fun Intent.putApiEndpointConfigurationExtra(apiEndpointConfiguration: ApiEndpointConfiguration) {
-    putExtra(OVERRIDE_API_EXTRA_NAME, apiEndpointConfiguration)
+fun Intent.putApiEndpointConfigurationExtra(apiEndpointOverrideConfiguration: ApiEndpointOverride) {
+    putExtra(OVERRIDE_API_EXTRA_NAME, apiEndpointOverrideConfiguration)
 }
 
-fun Intent.getApiEndpointConfigurationExtras(): ApiEndpointConfiguration? {
+fun Intent.getApiEndpointConfigurationExtras(): ApiEndpointOverride? {
     return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        getParcelableExtra(OVERRIDE_API_EXTRA_NAME, ApiEndpointConfiguration::class.java)
+        getParcelableExtra(OVERRIDE_API_EXTRA_NAME, ApiEndpointOverride::class.java)
     } else {
         getParcelableExtra(OVERRIDE_API_EXTRA_NAME)
     }
diff --git a/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointOverride.kt b/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointOverride.kt
new file mode 100644
index 0000000000..5201e86386
--- /dev/null
+++ b/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/ApiEndpointOverride.kt
@@ -0,0 +1,17 @@
+package net.mullvad.mullvadvpn.lib.endpoint
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class ApiEndpointOverride(
+    val hostname: String,
+    val port: Int = CUSTOM_ENDPOINT_HTTPS_PORT,
+    val disableAddressCache: Boolean = true,
+    val disableTls: Boolean = false,
+    val forceDirectConnection: Boolean = true,
+) : Parcelable {
+    companion object {
+        const val CUSTOM_ENDPOINT_HTTPS_PORT = 443
+    }
+}
diff --git a/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/CustomApiEndpointConfiguration.kt b/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/CustomApiEndpointConfiguration.kt
deleted file mode 100644
index 92dffed35f..0000000000
--- a/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/CustomApiEndpointConfiguration.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package net.mullvad.mullvadvpn.lib.endpoint
-
-import java.net.InetSocketAddress
-import kotlinx.parcelize.Parcelize
-
-const val CUSTOM_ENDPOINT_HTTPS_PORT = 443
-
-@Parcelize
-data class CustomApiEndpointConfiguration(
-    val hostname: String,
-    val port: Int,
-    val disableAddressCache: Boolean = true,
-    val disableTls: Boolean = false,
-) : ApiEndpointConfiguration {
-    override fun apiEndpoint() =
-        ApiEndpoint(
-            address = InetSocketAddress(hostname, port),
-            disableAddressCache = disableAddressCache,
-            disableTls = disableTls,
-        )
-}
diff --git a/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/DefaultApiEndpointConfiguration.kt b/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/DefaultApiEndpointConfiguration.kt
deleted file mode 100644
index 90b9bc7896..0000000000
--- a/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/DefaultApiEndpointConfiguration.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package net.mullvad.mullvadvpn.lib.endpoint
-
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-class DefaultApiEndpointConfiguration : ApiEndpointConfiguration {
-    override fun apiEndpoint(): ApiEndpoint? = null
-}