Sorting room list alphabetically case-insensitive. (matrix-org#1851)

NicolasBuquet · web-flow · commit 30d49a692548 · 2024-05-08T12:04:14.000+01:00
* Sort Room list alphabetically but caseInsensitive

Signed-off-by: Nicolas Buquet &lt;nbuquet@buquet-net.com&gt;

* Sort Room list alphabetically but caseInsensitive

Signed-off-by: Nicolas Buquet &lt;nbuquet@buquet-net.com&gt;

* Sort Room list alphabetically but caseInsensitive

Signed-off-by: Nicolas Buquet &lt;nbuquet@buquet-net.com&gt;

---------

Signed-off-by: Nicolas Buquet &lt;nbuquet@buquet-net.com&gt;
Co-authored-by: Nicolas Buquet &lt;nbuquet@buquet-net.com&gt;
diff --git a/MatrixSDK/Data/RoomList/Common/MXRoomListDataSortable.swift b/MatrixSDK/Data/RoomList/Common/MXRoomListDataSortable.swift
@@ -52,7 +52,7 @@ extension MXRoomListDataSortable {
 //        }
         
         if sortOptions.alphabetical {
-            result.append(NSSortDescriptor(keyPath: \MXRoomSummaryProtocol.displayName, ascending: true))
+            result.append(NSSortDescriptor(key: "displayName", ascending: true, selector: #selector(NSString.localizedStandardCompare(_:))))
         }
         
         if sortOptions.invitesFirst {
diff --git a/MatrixSDK/Data/RoomList/CoreData/MXCoreDataRoomListDataFetcher.swift b/MatrixSDK/Data/RoomList/CoreData/MXCoreDataRoomListDataFetcher.swift
@@ -250,7 +250,7 @@ extension MXCoreDataRoomListDataFetcher: MXRoomListDataSortable {
         var result: [NSSortDescriptor] = []
         
         if sortOptions.alphabetical {
-            result.append(NSSortDescriptor(keyPath: \MXRoomSummaryMO.s_displayName, ascending: true))
+            result.append(NSSortDescriptor(key: "s_displayName", ascending: true, selector: #selector(NSString.localizedStandardCompare(_:))))
         }
         
         if sortOptions.invitesFirst {
diff --git a/changelog.d/pr-1851.change b/changelog.d/pr-1851.change
@@ -0,0 +1 @@
+When sorting room list alphabetically, sort it case-insensitive.

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ extension MXRoomListDataSortable {`
`52`	`52`	`// }`
`53`	`53`
`54`	`54`	`if sortOptions.alphabetical {`
`55`		`- result.append(NSSortDescriptor(keyPath: \MXRoomSummaryProtocol.displayName, ascending: true))`
	`55`	`+ result.append(NSSortDescriptor(key: "displayName", ascending: true, selector: #selector(NSString.localizedStandardCompare(_:))))`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`if sortOptions.invitesFirst {`
Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,7 @@ extension MXCoreDataRoomListDataFetcher: MXRoomListDataSortable {`
`250`	`250`	`var result: [NSSortDescriptor] = []`
`251`	`251`
`252`	`252`	`if sortOptions.alphabetical {`
`253`		`- result.append(NSSortDescriptor(keyPath: \MXRoomSummaryMO.s_displayName, ascending: true))`
	`253`	`+ result.append(NSSortDescriptor(key: "s_displayName", ascending: true, selector: #selector(NSString.localizedStandardCompare(_:))))`
`254`	`254`	`}`
`255`	`255`
`256`	`256`	`if sortOptions.invitesFirst {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+When sorting room list alphabetically, sort it case-insensitive.`