Merge branch 'user-can-have-duplicate-entries-in-custom-list-droid-912'

Author: Rawa

android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModel.kt

@@ -19,6 +19,7 @@ import net.mullvad.mullvadvpn.model.Constraint
 import net.mullvad.mullvadvpn.model.Ownership
 import net.mullvad.mullvadvpn.relaylist.Provider
 import net.mullvad.mullvadvpn.relaylist.RelayItem
+import net.mullvad.mullvadvpn.relaylist.descendants
 import net.mullvad.mullvadvpn.relaylist.filterOnOwnershipAndProvider
 import net.mullvad.mullvadvpn.relaylist.filterOnSearchTerm
 import net.mullvad.mullvadvpn.relaylist.toLocationConstraint
@@ -137,7 +138,8 @@ class SelectLocationViewModel(
 
     fun addLocationToList(item: RelayItem, customList: RelayItem.CustomList) {
         viewModelScope.launch {
-            val newLocations = (customList.locations + item).map { it.code }
+            val newLocations =
+                (customList.locations + item).filter { it !in item.descendants() }.map { it.code }
             val result =
                 customListActionUseCase.performAction(
                     CustomListAction.UpdateLocations(customList.id, newLocations)

android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/SelectLocationViewModelTest.kt

@@ -29,6 +29,7 @@ import net.mullvad.mullvadvpn.model.Providers
 import net.mullvad.mullvadvpn.relaylist.Provider
 import net.mullvad.mullvadvpn.relaylist.RelayItem
 import net.mullvad.mullvadvpn.relaylist.RelayList
+import net.mullvad.mullvadvpn.relaylist.descendants
 import net.mullvad.mullvadvpn.relaylist.filterOnSearchTerm
 import net.mullvad.mullvadvpn.relaylist.toLocationConstraint
 import net.mullvad.mullvadvpn.ui.serviceconnection.ConnectionProxy
@@ -264,7 +265,10 @@ class SelectLocationViewModelTest {
     fun `after adding a location to a list should emit location added side effect`() = runTest {
         // Arrange
         val expectedResult: CustomListResult.LocationsChanged = mockk()
-        val location: RelayItem = mockk { every { code } returns "code" }
+        val location: RelayItem = mockk {
+            every { code } returns "code"
+            every { descendants() } returns emptyList()
+        }
         val customList: RelayItem.CustomList = mockk {
             every { id } returns "1"
             every { locations } returns emptyList()