Merge branch 'add-android-daita-droid-1192'

3 files changed, 14 insertions, 1 deletions

diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModelTest.kt
index e4012abd9e..1e0de9c96e 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModelTest.kt
@@ -322,6 +322,7 @@ class CustomListLocationsViewModelTest {
                                                     ProviderId("Provider"),
                                                     ownership = Ownership.MullvadOwned,
                                                 ),
+                                            daita = false,
                                         )
                                     ),
                             )
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModelTest.kt
index 5a44f6db06..bee888d279 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModelTest.kt
@@ -32,10 +32,12 @@ import net.mullvad.mullvadvpn.lib.model.Provider
 import net.mullvad.mullvadvpn.lib.model.Providers
 import net.mullvad.mullvadvpn.lib.model.RelayItem
 import net.mullvad.mullvadvpn.lib.model.RelayItemId
+import net.mullvad.mullvadvpn.lib.model.Settings
 import net.mullvad.mullvadvpn.relaylist.descendants
 import net.mullvad.mullvadvpn.repository.CustomListsRepository
 import net.mullvad.mullvadvpn.repository.RelayListFilterRepository
 import net.mullvad.mullvadvpn.repository.RelayListRepository
+import net.mullvad.mullvadvpn.repository.SettingsRepository
 import net.mullvad.mullvadvpn.usecase.AvailableProvidersUseCase
 import net.mullvad.mullvadvpn.usecase.FilteredRelayListUseCase
 import net.mullvad.mullvadvpn.usecase.customlists.CustomListActionUseCase
@@ -58,6 +60,9 @@ class SelectLocationViewModelTest {
     private val mockCustomListsRepository: CustomListsRepository = mockk()
     private val mockCustomListsRelayItemUseCase: CustomListsRelayItemUseCase = mockk()
 
+    private val mockSettingsRepository: SettingsRepository = mockk()
+    private val settingsFlow = MutableStateFlow(mockk<Settings>(relaxed = true))
+
     private lateinit var viewModel: SelectLocationViewModel
 
     private val allProviders = MutableStateFlow<List<Provider>>(emptyList())
@@ -79,6 +84,7 @@ class SelectLocationViewModelTest {
         every { mockFilteredRelayListUseCase() } returns filteredRelayList
         every { mockFilteredCustomListRelayItemsUseCase() } returns filteredCustomRelayListItems
         every { mockCustomListsRelayItemUseCase() } returns customListsRelayItem
+        every { mockSettingsRepository.settingsUpdates } returns settingsFlow
 
         mockkStatic(RELAY_LIST_EXTENSIONS)
         mockkStatic(RELAY_ITEM_EXTENSIONS)
@@ -93,6 +99,7 @@ class SelectLocationViewModelTest {
                 relayListRepository = mockRelayListRepository,
                 customListsRepository = mockCustomListsRepository,
                 customListsRelayItemUseCase = mockCustomListsRelayItemUseCase,
+                settingsRepository = mockSettingsRepository,
             )
     }
 
diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt
index c2f9ca34a6..89456c1d02 100644
--- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt
+++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModelTest.kt
@@ -113,7 +113,11 @@ class VpnSettingsViewModelTest {
             val mockTunnelOptions: TunnelOptions = mockk(relaxed = true)
             // Can not use a mock here since mocking a value class val leads to class cast exception
             val mockWireguardTunnelOptions =
-                WireguardTunnelOptions(mtu = Mtu(0), quantumResistant = expectedResistantState)
+                WireguardTunnelOptions(
+                    mtu = Mtu(0),
+                    quantumResistant = expectedResistantState,
+                    daita = false,
+                )
 
             every { mockSettings.tunnelOptions } returns mockTunnelOptions
             every { mockTunnelOptions.wireguard } returns mockWireguardTunnelOptions
@@ -146,6 +150,7 @@ class VpnSettingsViewModelTest {
                         WireguardTunnelOptions(
                             mtu = null,
                             quantumResistant = QuantumResistantState.Off,
+                            daita = false,
                         ),
                     dnsOptions = mockk(relaxed = true),
                 )