From a50844c0e6c54cb6951b03e469a9e88ffe5696de Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 18 Nov 2025 17:17:26 +0100
Subject: [PATCH] Avoid creating a new Collator and apply same decomposition
 across codebase.

---
 .../edit/EditDefaultNotificationSettingPresenter.kt         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingPresenter.kt b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingPresenter.kt
index 3d2356cb94..e13d8422ef 100644
--- a/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingPresenter.kt
+++ b/features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingPresenter.kt
@@ -49,6 +49,10 @@ class EditDefaultNotificationSettingPresenter(
         fun create(oneToOne: Boolean): EditDefaultNotificationSettingPresenter
     }
 
+    private val collator = Collator.getInstance().apply {
+        decomposition = Collator.CANONICAL_DECOMPOSITION
+    }
+
     @Composable
     override fun present(): EditDefaultNotificationSettingState {
         var displayMentionsOnlyDisclaimer by remember { mutableStateOf(false) }
@@ -139,7 +143,7 @@ class EditDefaultNotificationSettingPresenter(
             }
             // locale sensitive sorting
             .sortedWith(
-                compareBy(Collator.getInstance()) { roomSummary ->
+                compareBy(collator) { roomSummary ->
                     // Collator does not handle null values, so we provide a fallback
                     roomSummary.name ?: roomSummary.roomId.value
                 }