Merge branch 'sort-split-tunneling-apps-in-alphabetical-order-droid-168'

1 files changed, 6 insertions, 5 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 eb798eb2c5..7e258869fa 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
@@ -13,13 +13,14 @@ data class SplitTunnelingViewModelState(
             ?.partition { appData -> excludedApps.contains(appData.packageName) }
             ?.let { (excluded, included) ->
                 SplitTunnelingUiState.ShowAppList(
-                    excludedApps = excluded,
+                    excludedApps = excluded.sortedBy { it.name },
                     includedApps =
                         if (showSystemApps) {
-                            included
-                        } else {
-                            included.filter { appData -> !appData.isSystemApp }
-                        },
+                                included
+                            } else {
+                                included.filter { appData -> !appData.isSystemApp }
+                            }
+                            .sortedBy { it.name },
                     showSystemApps = showSystemApps
                 )
             }