Refactor custom api endpoint config

3 files changed, 28 insertions, 19 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..ba79bdff62
--- /dev/null
+++ b/android/lib/endpoint/src/main/kotlin/net/mullvad/mullvadvpn/lib/endpoint/CustomApiEndpointConfiguration.kt
@@ -0,0 +1,21 @@
+package net.mullvad.mullvadvpn.lib.endpoint
+
+import java.net.InetSocketAddress
+import kotlinx.parcelize.Parcelize
+
+@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
+        )
+}
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 bb5c20eebb..f699b3cadc 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
@@ -9,8 +9,6 @@ import androidx.test.rule.GrantPermissionRule
 import androidx.test.runner.AndroidJUnit4
 import androidx.test.uiautomator.UiDevice
 import java.net.InetAddress
-import java.net.InetSocketAddress
-import net.mullvad.mullvadvpn.lib.endpoint.ApiEndpoint
 import net.mullvad.mullvadvpn.lib.endpoint.CustomApiEndpointConfiguration
 import net.mullvad.mullvadvpn.test.common.interactor.AppInteractor
 import net.mullvad.mullvadvpn.test.common.rule.CaptureScreenshotOnFailedTestRule
@@ -57,14 +55,12 @@ abstract class MockApiTest {
     }
 
     private fun createEndpoint(port: Int): CustomApiEndpointConfiguration {
-        val mockApiSocket = InetSocketAddress(InetAddress.getLocalHost(), port)
-        val api =
-            ApiEndpoint(
-                address = mockApiSocket,
-                disableAddressCache = true,
-                disableTls = true,
-                forceDirectConnection = true
-            )
-        return CustomApiEndpointConfiguration(api)
+        return CustomApiEndpointConfiguration(
+            InetAddress.getLocalHost().hostName,
+            port,
+            disableAddressCache = true,
+            disableTls = true,
+            forceDirectConnection = true
+        )
     }
 }