diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-12-23 18:32:12 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-01-08 09:27:06 +0100 |
| commit | 7e8f6c9c648d8346b2a32a61ab23e55bcd9e6fc3 (patch) | |
| tree | 1250188c971f4e8e11d77d035e82ae2a29e680e8 /android | |
| parent | 0f33bd4bcbdf7fc3a9defb79b38f30a37038e89f (diff) | |
| download | mullvadvpn-7e8f6c9c648d8346b2a32a61ab23e55bcd9e6fc3.tar.xz mullvadvpn-7e8f6c9c648d8346b2a32a61ab23e55bcd9e6fc3.zip | |
Fix error
Diffstat (limited to 'android')
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt | 3 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/RelayFilterUiState.kt | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt index 00d1e3bb9a..7cc375f185 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/FilterScreen.kt @@ -247,7 +247,8 @@ private fun LazyItemScope.RemovedProvider( state: RelayFilterUiState, onSelectedProvider: (checked: Boolean, providerId: ProviderId) -> Unit, ) { - val checked = providerId in state.selectedProviders + val checked = + state.selectedProviders is Constraint.Only && providerId in state.selectedProviders.value CheckboxCell( title = stringResource(R.string.removed_provider, providerId.value), checked = checked, diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/RelayFilterUiState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/RelayFilterUiState.kt index d3e8a2b685..cd4b2b324f 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/RelayFilterUiState.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/state/RelayFilterUiState.kt @@ -35,7 +35,11 @@ data class RelayFilterUiState( }.sorted() val isApplyButtonEnabled = selectedProviders.getOrNull()?.isNotEmpty() != false - val removedProviders: List<ProviderId> = selectedProviders - allProviders + val removedProviders: List<ProviderId> = + when (selectedProviders) { + Constraint.Any -> emptyList() + is Constraint.Only -> selectedProviders.value.toList() - allProviders + } val isAllProvidersChecked = selectedProviders is Constraint.Any } |