Move ApiEndpointOverride to its own bean in app module

1 files changed, 1 insertions, 8 deletions

diff --git a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/di/VpnServiceModule.kt b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/di/VpnServiceModule.kt
index f5ddd24578..c4a000b059 100644
--- a/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/di/VpnServiceModule.kt
+++ b/android/service/src/main/kotlin/net/mullvad/mullvadvpn/service/di/VpnServiceModule.kt
@@ -3,8 +3,6 @@ package net.mullvad.mullvadvpn.service.di
 import net.mullvad.mullvadvpn.lib.common.constant.CACHE_DIR_NAMED_ARGUMENT
 import net.mullvad.mullvadvpn.lib.common.constant.FILES_DIR_NAMED_ARGUMENT
 import net.mullvad.mullvadvpn.lib.common.constant.GRPC_SOCKET_FILE_NAMED_ARGUMENT
-import net.mullvad.mullvadvpn.lib.endpoint.ApiEndpointOverride
-import net.mullvad.mullvadvpn.service.BuildConfig
 import net.mullvad.mullvadvpn.service.DaemonConfig
 import net.mullvad.mullvadvpn.service.migration.MigrateSplitTunneling
 import org.koin.android.ext.koin.androidContext
@@ -22,12 +20,7 @@ val vpnServiceModule = module {
             rpcSocket = get(named(GRPC_SOCKET_FILE_NAMED_ARGUMENT)),
             filesDir = get(named(FILES_DIR_NAMED_ARGUMENT)),
             cacheDir = get(named(CACHE_DIR_NAMED_ARGUMENT)),
-            apiEndpointOverride =
-                if (BuildConfig.FLAVOR_infrastructure != "prod") {
-                    ApiEndpointOverride(BuildConfig.API_ENDPOINT, BuildConfig.API_IP)
-                } else {
-                    null
-                },
+            apiEndpointOverride = getOrNull(),
         )
     }
 }