Merge branch 'develop' into bug-fix-1846-new

3d0a65d4 · Filipe de Lima Brito · GitHub · 05f63609 · bd657f94 · 3d0a65d4
Unverified Commit 3d0a65d4 authored Apr 24, 2019 by Filipe de Lima Brito Committed by GitHub Apr 24, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ChatRoomDao.kt app/src/main/java/chat/rocket/android/db/ChatRoomDao.kt +2 -2

No files found.
--- a/app/src/main/java/chat/rocket/android/db/ChatRoomDao.kt
+++ b/app/src/main/java/chat/rocket/android/db/ChatRoomDao.kt
@@ -69,7 +69,7 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
    @Query("""
        $BASE_QUERY
        $FILTER_NOT_OPENED
-        ORDER BY name
+        ORDER BY name COLLATE NOCASE
        """)
    abstract fun getAllAlphabetically(): LiveData<List<ChatRoom>>

@@ -79,7 +79,7 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
        $FILTER_NOT_OPENED
        ORDER BY
            $TYPE_ORDER,
-            name
+            name COLLATE NOCASE
        """)
    abstract fun getAllAlphabeticallyGrouped(): LiveData<List<ChatRoom>>