From 35b07a3a45ad56d2116bd6dbb42b9bfa372257ee Mon Sep 17 00:00:00 2001 From: Jonatan Rhodin Date: Wed, 19 Jun 2024 14:43:10 +0200 Subject: [PATCH] Ignore case when ordering split tunneling apps --- .../mullvadvpn/viewmodel/SplitTunnelingViewModelState.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelState.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelState.kt index 89dde0decb87..38eac0d4eec1 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelState.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/SplitTunnelingViewModelState.kt @@ -22,16 +22,18 @@ data class SplitTunnelingViewModelState( ?.let { (excluded, included) -> SplitTunnelingUiState.ShowAppList( enabled = enabled, - excludedApps = excluded.sortedBy { it.name }, + excludedApps = excluded.sort(), includedApps = if (showSystemApps) { included } else { included.filter { appData -> !appData.isSystemApp } } - .sortedBy { it.name }, + .sort(), showSystemApps = showSystemApps ) } ?: SplitTunnelingUiState.Loading(enabled = enabled) } } + +private fun List.sort() = sortedBy { it.name.lowercase() }