diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-10-09 16:06:01 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-10-09 16:06:01 +0200 |
| commit | 6c1f16c386c2d4cd3560c3a4cce7900f267058ad (patch) | |
| tree | 9697da56b0ff968a06c91749f8055d6c86981bd8 /android | |
| parent | 72edaa766f18d12ebbd56ffc610c8a84d57e0b8a (diff) | |
| parent | 871255dfa322a4762e0a1d553e54e6513d2ba845 (diff) | |
| download | mullvadvpn-6c1f16c386c2d4cd3560c3a4cce7900f267058ad.tar.xz mullvadvpn-6c1f16c386c2d4cd3560c3a4cce7900f267058ad.zip | |
Merge branch 'crash-in-customlistlocationsscreen-droid-1406'
Diffstat (limited to 'android')
| -rw-r--r-- | android/CHANGELOG.md | 1 | ||||
| -rw-r--r-- | android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModel.kt | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/android/CHANGELOG.md b/android/CHANGELOG.md index 495228b43d..a51a1deacf 100644 --- a/android/CHANGELOG.md +++ b/android/CHANGELOG.md @@ -38,6 +38,7 @@ Line wrap the file at 100 chars. Th ### Fixed - Fix VPN service being recreated multiple times when toggling certain options. - Fix unlabeled icon buttons for basic accessibility with screen readers. +- Fix crash when in the edit custom list locations screen and changing app langauge. ## [android/2024.4] - 2024-09-03 diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModel.kt index 271e7cd7f5..320420369d 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModel.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/CustomListLocationsViewModel.kt @@ -11,10 +11,10 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.combine -import kotlinx.coroutines.flow.consumeAsFlow import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach +import kotlinx.coroutines.flow.receiveAsFlow import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch @@ -43,7 +43,7 @@ class CustomListLocationsViewModel( private val navArgs = CustomListLocationsDestination.argsFrom(savedStateHandle = savedStateHandle) private val _uiSideEffect = Channel<CustomListLocationsSideEffect>() - val uiSideEffect: Flow<CustomListLocationsSideEffect> = _uiSideEffect.consumeAsFlow() + val uiSideEffect: Flow<CustomListLocationsSideEffect> = _uiSideEffect.receiveAsFlow() private val _initialLocations = MutableStateFlow<Set<RelayItem.Location>>(emptySet()) private val _selectedLocations = MutableStateFlow<Set<RelayItem.Location>?>(null) |