Disconnect provider and ownership

Author: Rawa

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/FilterUiStatePreviewParameterProvider.kt

@@ -7,15 +7,15 @@ import net.mullvad.mullvadvpn.lib.model.Provider
 import net.mullvad.mullvadvpn.lib.model.ProviderId
 
 private val PROVIDER =
-    Provider(providerId = ProviderId("provider1"), ownership = Ownership.MullvadOwned)
+    Provider(providerId = ProviderId("provider1"), ownership = setOf(Ownership.MullvadOwned))
 
 class FilterUiStatePreviewParameterProvider : PreviewParameterProvider<RelayFilterUiState> {
     override val values =
         sequenceOf(
             RelayFilterUiState(
                 selectedOwnership = Ownership.MullvadOwned,
-                allProviders = listOf(PROVIDER),
-                selectedProviders = listOf(PROVIDER),
+                filteredProvidersByOwnership = listOf(PROVIDER.providerId),
+                selectedProviders = listOf(PROVIDER.providerId),
             )
         )
 }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/preview/RelayItemPreviewData.kt

@@ -2,7 +2,6 @@ package net.mullvad.mullvadvpn.compose.preview
 
 import net.mullvad.mullvadvpn.lib.model.GeoLocationId
 import net.mullvad.mullvadvpn.lib.model.Ownership
-import net.mullvad.mullvadvpn.lib.model.Provider
 import net.mullvad.mullvadvpn.lib.model.ProviderId
 import net.mullvad.mullvadvpn.lib.model.RelayItem
 
@@ -56,7 +55,8 @@ private fun generateRelayItemRelay(
     RelayItem.Location.Relay(
         id = GeoLocationId.Hostname(city = cityCode, code = hostName),
         active = active,
-        provider = Provider(ProviderId("Provider"), Ownership.MullvadOwned),
+        provider = ProviderId("Provider"),
+        ownership = Ownership.MullvadOwned,
         daita = daita,
     )
 

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt

@@ -47,6 +47,7 @@ import net.mullvad.mullvadvpn.compose.transitions.SlideInFromRightTransition
 import net.mullvad.mullvadvpn.compose.util.CollectSideEffectWithLifecycle
 import net.mullvad.mullvadvpn.lib.model.Ownership
 import net.mullvad.mullvadvpn.lib.model.Provider
+import net.mullvad.mullvadvpn.lib.model.ProviderId
 import net.mullvad.mullvadvpn.lib.theme.AppTheme
 import net.mullvad.mullvadvpn.lib.theme.Dimens
 import net.mullvad.mullvadvpn.viewmodel.FilterScreenSideEffect
@@ -98,7 +99,7 @@ fun FilterScreen(
     onApplyClick: () -> Unit,
     onSelectedOwnership: (ownership: Ownership?) -> Unit,
     onAllProviderCheckChange: (isChecked: Boolean) -> Unit,
-    onSelectedProvider: (checked: Boolean, provider: Provider) -> Unit,
+    onSelectedProvider: (checked: Boolean, provider: ProviderId) -> Unit,
 ) {
     var providerExpanded by rememberSaveable { mutableStateOf(false) }
     var ownershipExpanded by rememberSaveable { mutableStateOf(false) }
@@ -139,7 +140,7 @@ fun FilterScreen(
                     AllProviders(state, onAllProviderCheckChange)
                 }
                 itemsWithDivider(
-                    key = { it.providerId.value },
+                    key = { it.value },
                     contentType = { ContentType.ITEM },
                     items = state.filteredProvidersByOwnership,
                 ) { provider ->
@@ -216,14 +217,14 @@ private fun LazyItemScope.AllProviders(
 
 @Composable
 private fun LazyItemScope.Provider(
-    provider: Provider,
+    providerId: ProviderId,
     state: RelayFilterUiState,
-    onSelectedProvider: (checked: Boolean, provider: Provider) -> Unit,
+    onSelectedProvider: (checked: Boolean, providerId: ProviderId) -> Unit,
 ) {
     CheckboxCell(
-        title = provider.providerId.value,
-        checked = provider in state.selectedProviders,
-        onCheckedChange = { checked -> onSelectedProvider(checked, provider) },
+        title = providerId.value,
+        checked = providerId in state.selectedProviders,
+        onCheckedChange = { checked -> onSelectedProvider(checked, providerId) },
         modifier = Modifier.animateItem(),
     )
 }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/FilterConstrainExtensions.kt

@@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.compose.state
 import net.mullvad.mullvadvpn.lib.model.Constraint
 import net.mullvad.mullvadvpn.lib.model.Ownership
 import net.mullvad.mullvadvpn.lib.model.Provider
+import net.mullvad.mullvadvpn.lib.model.ProviderId
 import net.mullvad.mullvadvpn.lib.model.Providers
 
 fun Ownership?.toOwnershipConstraint(): Constraint<Ownership> =
@@ -20,9 +21,9 @@ fun Constraint<Providers>.toSelectedProviders(allProviders: List<Provider>): Lis
             }
     }
 
-fun List<Provider>.toConstraintProviders(allProviders: List<Provider>): Constraint<Providers> =
+fun List<ProviderId>.toConstraintProviders(allProviders: List<ProviderId>): Constraint<Providers> =
     if (size == allProviders.size) {
         Constraint.Any
     } else {
-        Constraint.Only(Providers(map { provider -> provider.providerId }.toHashSet()))
+        Constraint.Only(Providers(toHashSet()))
     }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/RelayFilterUiState.kt

@@ -1,26 +1,16 @@
 package net.mullvad.mullvadvpn.compose.state
 
 import net.mullvad.mullvadvpn.lib.model.Ownership
-import net.mullvad.mullvadvpn.lib.model.Provider
+import net.mullvad.mullvadvpn.lib.model.ProviderId
 
 data class RelayFilterUiState(
+    val filteredOwnershipByProviders: List<Ownership> = Ownership.entries,
     val selectedOwnership: Ownership? = null,
-    val allProviders: List<Provider> = emptyList(),
-    val selectedProviders: List<Provider> = allProviders,
+    val filteredProvidersByOwnership: List<ProviderId> = listOf(),
+    val allProviders: List<ProviderId> = emptyList(),
+    val selectedProviders: List<ProviderId> = filteredProvidersByOwnership,
 ) {
     val isApplyButtonEnabled = selectedProviders.isNotEmpty()
 
-    val filteredOwnershipByProviders =
-        if (selectedProviders.isEmpty()) {
-            Ownership.entries
-        } else {
-            Ownership.entries.filter { ownership ->
-                selectedProviders.any { provider -> provider.ownership == ownership }
-            }
-        }
-    val filteredProvidersByOwnership =
-        if (selectedOwnership == null) allProviders
-        else allProviders.filter { provider -> provider.ownership == selectedOwnership }
-
     val isAllProvidersChecked = allProviders.size == selectedProviders.size
 }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemExtensions.kt

@@ -35,7 +35,7 @@ private fun RelayItem.Location.hasOwnership(ownershipConstraint: Constraint<Owne
         when (this) {
             is RelayItem.Location.Country -> cities.any { it.hasOwnership(ownershipConstraint) }
             is RelayItem.Location.City -> relays.any { it.hasOwnership(ownershipConstraint) }
-            is RelayItem.Location.Relay -> this.provider.ownership == ownershipConstraint.value
+            is RelayItem.Location.Relay -> ownershipConstraint.value == ownership
         }
     } else {
         true
@@ -46,8 +46,7 @@ private fun RelayItem.Location.hasProvider(providersConstraint: Constraint<Provi
         when (this) {
             is RelayItem.Location.Country -> cities.any { it.hasProvider(providersConstraint) }
             is RelayItem.Location.City -> relays.any { it.hasProvider(providersConstraint) }
-            is RelayItem.Location.Relay ->
-                providersConstraint.value.providers.contains(provider.providerId)
+            is RelayItem.Location.Relay -> providersConstraint.value.providers.contains(provider)
         }
     } else {
         true

android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/AvailableProvidersUseCase.kt

@@ -13,7 +13,8 @@ class AvailableProvidersUseCase(private val relayListRepository: RelayListReposi
             relayList
                 .flatMap(RelayItem.Location.Country::cities)
                 .flatMap(RelayItem.Location.City::relays)
-                .map(RelayItem.Location.Relay::provider)
-                .distinct()
+                .groupBy({ it.provider }, { it.ownership })
+                .map { (provider, ownerships) -> Provider(provider, ownerships.toSet()) }
+                .sortedBy { it.providerId.value.uppercase() }
         }
 }

android/app/src/main/kotlin/net/mullvad/mullvadvpn/usecase/FilterChipUseCase.kt

@@ -87,8 +87,11 @@ class FilterChipUseCase(
         selectedProviders: List<Provider>,
         selectedOwnership: Ownership?,
     ): List<Provider> =
-        if (selectedOwnership == null) selectedProviders
-        else selectedProviders.filter { it.ownership == selectedOwnership }
+        if (selectedOwnership != null) {
+            selectedProviders.filter { it.ownership.contains(selectedOwnership) }
+        } else {
+            selectedProviders
+        }
 
     private fun Settings.daitaAndDirectOnly() =
         tunnelOptions.wireguard.daitaSettings.enabled &&

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

@@ -16,7 +16,7 @@ import net.mullvad.mullvadvpn.compose.state.toConstraintProviders
 import net.mullvad.mullvadvpn.compose.state.toOwnershipConstraint
 import net.mullvad.mullvadvpn.compose.state.toSelectedProviders
 import net.mullvad.mullvadvpn.lib.model.Ownership
-import net.mullvad.mullvadvpn.lib.model.Provider
+import net.mullvad.mullvadvpn.lib.model.ProviderId
 import net.mullvad.mullvadvpn.repository.RelayListFilterRepository
 import net.mullvad.mullvadvpn.usecase.AvailableProvidersUseCase
 
@@ -28,15 +28,17 @@ class FilterViewModel(
     val uiSideEffect = _uiSideEffect.receiveAsFlow()
 
     private val selectedOwnership = MutableStateFlow<Ownership?>(null)
-    private val selectedProviders = MutableStateFlow<List<Provider>>(emptyList())
+    private val selectedProviders = MutableStateFlow<List<ProviderId>>(emptyList())
 
     init {
         viewModelScope.launch {
             selectedProviders.value =
                 combine(availableProvidersUseCase(), relayListFilterRepository.selectedProviders) {
                         allProviders,
                         selectedConstraintProviders ->
-                        selectedConstraintProviders.toSelectedProviders(allProviders)
+                        selectedConstraintProviders.toSelectedProviders(allProviders).map {
+                            it.providerId
+                        }
                     }
                     .first()
 
@@ -51,26 +53,36 @@ class FilterViewModel(
                 allProviders,
                 selectedProviders ->
                 RelayFilterUiState(
+                    filteredOwnershipByProviders =
+                        if (selectedProviders.isEmpty()) {
+                            Ownership.entries
+                        } else {
+                            Ownership.entries.filter { ownership ->
+                                selectedProviders.any { providerId ->
+                                    allProviders.any {
+                                        it.providerId == providerId && ownership in it.ownership
+                                    }
+                                }
+                            }
+                        },
                     selectedOwnership = selectedOwnership,
-                    allProviders = allProviders,
+                    filteredProvidersByOwnership =
+                        if (selectedOwnership != null)
+                            allProviders
+                                .filter { provider -> selectedOwnership in provider.ownership }
+                                .map { it.providerId }
+                        else allProviders.map { it.providerId },
+                    allProviders = allProviders.map { it.providerId },
                     selectedProviders = selectedProviders,
                 )
             }
-            .stateIn(
-                viewModelScope,
-                SharingStarted.WhileSubscribed(),
-                RelayFilterUiState(
-                    allProviders = emptyList(),
-                    selectedOwnership = null,
-                    selectedProviders = emptyList(),
-                ),
-            )
+            .stateIn(viewModelScope, SharingStarted.WhileSubscribed(), RelayFilterUiState())
 
     fun setSelectedOwnership(ownership: Ownership?) {
         selectedOwnership.value = ownership
     }
 
-    fun setSelectedProvider(checked: Boolean, provider: Provider) {
+    fun setSelectedProvider(checked: Boolean, provider: ProviderId) {
         selectedProviders.value =
             if (checked) {
                 selectedProviders.value + provider
@@ -83,7 +95,7 @@ class FilterViewModel(
         viewModelScope.launch {
             selectedProviders.value =
                 if (isChecked) {
-                    availableProvidersUseCase().first()
+                    availableProvidersUseCase().first().map { it.providerId }
                 } else {
                     emptyList()
                 }
@@ -92,8 +104,11 @@ class FilterViewModel(
 
     fun onApplyButtonClicked() {
         val newSelectedOwnership = selectedOwnership.value.toOwnershipConstraint()
+        // TODO should be all providers?!
         val newSelectedProviders =
-            selectedProviders.value.toConstraintProviders(uiState.value.allProviders)
+            selectedProviders.value.toConstraintProviders(
+                uiState.value.filteredProvidersByOwnership
+            )
 
         viewModelScope.launch {
             relayListFilterRepository.updateSelectedOwnershipAndProviderFilter(

android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/mapper/ToDomain.kt

@@ -52,7 +52,6 @@ import net.mullvad.mullvadvpn.lib.model.ParameterGenerationError
 import net.mullvad.mullvadvpn.lib.model.PlayPurchasePaymentToken
 import net.mullvad.mullvadvpn.lib.model.Port
 import net.mullvad.mullvadvpn.lib.model.PortRange
-import net.mullvad.mullvadvpn.lib.model.Provider
 import net.mullvad.mullvadvpn.lib.model.ProviderId
 import net.mullvad.mullvadvpn.lib.model.Providers
 import net.mullvad.mullvadvpn.lib.model.QuantumResistantState
@@ -565,11 +564,8 @@ internal fun ManagementInterface.Relay.toDomain(
     RelayItem.Location.Relay(
         id = GeoLocationId.Hostname(cityCode, hostname),
         active = active,
-        provider =
-            Provider(
-                ProviderId(provider),
-                ownership = if (owned) Ownership.MullvadOwned else Ownership.Rented,
-            ),
+        provider = ProviderId(provider),
+        ownership = if (owned) Ownership.MullvadOwned else Ownership.Rented,
         daita =
             if (
                 hasEndpointData() && endpointType == ManagementInterface.Relay.RelayType.WIREGUARD

android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/Provider.kt

@@ -1,3 +1,9 @@
 package net.mullvad.mullvadvpn.lib.model
 
-data class Provider(val providerId: ProviderId, val ownership: Ownership)
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+import kotlinx.parcelize.RawValue
+
+@Parcelize
+data class Provider(val providerId: @RawValue ProviderId, val ownership: Set<Ownership>) :
+    Parcelable

android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/lib/model/RelayItem.kt

@@ -56,7 +56,8 @@ sealed interface RelayItem {
         @optics
         data class Relay(
             override val id: GeoLocationId.Hostname,
-            val provider: Provider,
+            val provider: ProviderId,
+            val ownership: Ownership,
             override val active: Boolean,
             val daita: Boolean,
         ) : Location {