Merge branch 'use-custom-flavor-endpoints'

2 files changed, 23 insertions, 8 deletions

diff --git a/android/lib/endpoint/src/debug/kotlin/net/mullvad/mullvadvpn/lib/endpoint/CustomApiEndpointConfiguration.kt b/android/lib/endpoint/src/debug/kotlin/net/mullvad/mullvadvpn/lib/endpoint/CustomApiEndpointConfiguration.kt
deleted file mode 100644
index 5fb8db5fe1..0000000000
--- a/android/lib/endpoint/src/debug/kotlin/net/mullvad/mullvadvpn/lib/endpoint/CustomApiEndpointConfiguration.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package net.mullvad.mullvadvpn.lib.endpoint
-
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class CustomApiEndpointConfiguration(val apiEndpoint: ApiEndpoint) : ApiEndpointConfiguration {
-    override fun apiEndpoint() = apiEndpoint
-}
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
new file mode 100644
index 0000000000..9d2ba2420f
--- /dev/null
+++ b/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/CustomApiEndpointConfiguration.kt
@@ -0,0 +1,23 @@
+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 = false,
+    val disableTls: Boolean = false,
+    val forceDirectConnection: Boolean = false
+) : ApiEndpointConfiguration {
+    override fun apiEndpoint() =
+        ApiEndpoint(
+            address = InetSocketAddress(hostname, port),
+            disableAddressCache = disableAddressCache,
+            disableTls = disableTls,
+            forceDirectConnection = forceDirectConnection
+        )
+}