Move ApiEndpointOverride to its own bean in app module

3 files changed, 11 insertions, 10 deletions

diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/AppModule.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/AppModule.kt
index 980efa10d2..58b1a6e478 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/AppModule.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/AppModule.kt
@@ -12,6 +12,7 @@ import net.mullvad.mullvadvpn.lib.common.constant.GRPC_SOCKET_FILE_NAME
 import net.mullvad.mullvadvpn.lib.common.constant.GRPC_SOCKET_FILE_NAMED_ARGUMENT
 import net.mullvad.mullvadvpn.lib.daemon.grpc.ManagementService
 import net.mullvad.mullvadvpn.lib.endpoint.ApiEndpointFromIntentHolder
+import net.mullvad.mullvadvpn.lib.endpoint.ApiEndpointOverride
 import net.mullvad.mullvadvpn.lib.model.BuildVersion
 import net.mullvad.mullvadvpn.lib.model.NotificationChannel
 import net.mullvad.mullvadvpn.lib.shared.AccountRepository
@@ -85,6 +86,14 @@ val appModule = module {
     } bind NotificationProvider::class
     single { AccountExpiryNotificationProvider(get<NotificationChannel.AccountUpdates>().id) } bind
         NotificationProvider::class
+    if (net.mullvad.mullvadvpn.service.BuildConfig.FLAVOR_infrastructure != "prod") {
+        single<ApiEndpointOverride> {
+            ApiEndpointOverride(
+                net.mullvad.mullvadvpn.service.BuildConfig.API_ENDPOINT,
+                net.mullvad.mullvadvpn.service.BuildConfig.API_IP,
+            )
+        }
+    }
 }
 
 private val Context.userPreferencesStore: DataStore<UserPreferences> by
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
index ffaa2e2eb3..c05502a11a 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/di/UiModule.kt
@@ -27,7 +27,6 @@ import net.mullvad.mullvadvpn.repository.SettingsRepository
 import net.mullvad.mullvadvpn.repository.SplashCompleteRepository
 import net.mullvad.mullvadvpn.repository.SplitTunnelingRepository
 import net.mullvad.mullvadvpn.repository.WireguardConstraintsRepository
-import net.mullvad.mullvadvpn.service.DaemonConfig
 import net.mullvad.mullvadvpn.ui.MainActivity
 import net.mullvad.mullvadvpn.ui.serviceconnection.AppVersionInfoRepository
 import net.mullvad.mullvadvpn.ui.serviceconnection.ServiceConnectionManager
@@ -130,7 +129,7 @@ val uiModule = module {
     single {
         MullvadProblemReport(
             context = androidContext(),
-            apiEndpointOverride = get<DaemonConfig>().apiEndpointOverride,
+            apiEndpointOverride = getOrNull(),
             apiEndpointFromIntentHolder = get(),
         )
     }
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(),
         )
     }
 }