Merge pull request #4785 from mykh-hailo/fix/sort_alphabetical_order

[FIX] Sort is not alphabetically correct

Author: jesmrec

changelog/unreleased/4785

@@ -0,0 +1,6 @@
+Bugfix: Sort is not alphabetically correct
+
+Locale-aware collation has been applied to file sorting by name to handle accented characters correctly.
+
+https://github.com/owncloud/android/issues/4760
+https://github.com/owncloud/android/pull/4785

owncloudApp/src/main/java/com/owncloud/android/utils/SortFilesUtils.kt

@@ -20,6 +20,8 @@ package com.owncloud.android.utils
 
 import com.owncloud.android.domain.files.model.OCFile
 import com.owncloud.android.presentation.files.SortType
+import java.text.Collator
+import java.util.Locale
 
 class SortFilesUtils {
     fun sortFiles(
@@ -34,12 +36,16 @@ class SortFilesUtils {
         }
 
     private fun sortByName(listOfFiles: List<OCFile>, ascending: Boolean): List<OCFile> {
-        val newListOfFiles =
-            if (ascending) listOfFiles.sortedBy { it.fileName.lowercase() }
-            else listOfFiles.sortedByDescending { it.fileName.lowercase() }
+        val collator = Collator.getInstance(Locale.getDefault()).apply {
+            strength = Collator.PRIMARY   // Ignore accents and case
+        }
+
+        val nameComparator =
+            if (ascending) compareBy<OCFile, String>(collator) { it.fileName }
+            else compareByDescending(collator) { it.fileName }
 
         // Show first the folders when sorting by name
-        return newListOfFiles.sortedByDescending { it.isFolder }
+        return listOfFiles.sortedWith(compareByDescending<OCFile> { it.isFolder }.then(nameComparator))
     }
 
     private fun sortBySize(listOfFiles: List<OCFile>, ascending: Boolean): List<OCFile> =

owncloudDomain/src/main/java/com/owncloud/android/domain/files/usecases/SortFilesUseCase.kt

@@ -20,6 +20,8 @@ package com.owncloud.android.domain.files.usecases
 
 import com.owncloud.android.domain.BaseUseCase
 import com.owncloud.android.domain.files.model.OCFile
+import java.text.Collator
+import java.util.Locale
 
 class SortFilesUseCase : BaseUseCase<List<OCFile>, SortFilesUseCase.Params>() {
 
@@ -31,12 +33,16 @@ class SortFilesUseCase : BaseUseCase<List<OCFile>, SortFilesUseCase.Params>() {
         }
 
     private fun sortByName(listOfFiles: List<OCFile>, ascending: Boolean): List<OCFile> {
-        val newListOfFiles =
-            if (ascending) listOfFiles.sortedBy { it.fileName.lowercase() }
-            else listOfFiles.sortedByDescending { it.fileName.lowercase() }
+        val collator = Collator.getInstance(Locale.getDefault()).apply {
+            strength = Collator.PRIMARY   // Ignore accents and case
+        }
+
+        val nameComparator =
+            if (ascending) compareBy<OCFile, String>(collator) { it.fileName }
+            else compareByDescending(collator) { it.fileName }
 
         // Show first the folders when sorting by name
-        return newListOfFiles.sortedByDescending { it.isFolder }
+        return listOfFiles.sortedWith(compareByDescending<OCFile> { it.isFolder }.then(nameComparator))
     }
 
     private fun sortBySize(listOfFiles: List<OCFile>, ascending: Boolean): List<OCFile> =

owncloudDomain/src/main/java/com/owncloud/android/domain/files/usecases/SortFilesWithSyncInfoUseCase.kt

@@ -22,6 +22,8 @@ package com.owncloud.android.domain.files.usecases
 
 import com.owncloud.android.domain.BaseUseCase
 import com.owncloud.android.domain.files.model.OCFileWithSyncInfo
+import java.text.Collator
+import java.util.Locale
 
 class SortFilesWithSyncInfoUseCase : BaseUseCase<List<OCFileWithSyncInfo>, SortFilesWithSyncInfoUseCase.Params>() {
 
@@ -33,12 +35,16 @@ class SortFilesWithSyncInfoUseCase : BaseUseCase<List<OCFileWithSyncInfo>, SortF
         }
 
     private fun sortByName(listOfFiles: List<OCFileWithSyncInfo>, ascending: Boolean): List<OCFileWithSyncInfo> {
-        val newListOfFiles =
-            if (ascending) listOfFiles.sortedBy { it.file.fileName.lowercase() }
-            else listOfFiles.sortedByDescending { it.file.fileName.lowercase() }
+        val collator = Collator.getInstance(Locale.getDefault()).apply {
+            strength = Collator.PRIMARY   // Ignore accents and case
+        }
+
+        val nameComparator =
+            if (ascending) compareBy<OCFileWithSyncInfo, String>(collator) { it.file.fileName }
+            else compareByDescending(collator) { it.file.fileName }
 
         // Show first the folders when sorting by name
-        return newListOfFiles.sortedByDescending { it.file.isFolder }
+        return listOfFiles.sortedWith(compareByDescending<OCFileWithSyncInfo> { it.file.isFolder }.then(nameComparator))
     }
 
     private fun sortBySize(listOfFiles: List<OCFileWithSyncInfo>, ascending: Boolean): List<OCFileWithSyncInfo> =