tdf#96795: Use locale-sensitive sorting in Android viewer
Change-Id: I98edec9f57f1bf0576e16a1ba3c0e023d6d0b6ed
Signed-off-by: Mert Tümer <[email protected]>
Reviewed-on: https://gerrit.libreoffice.org/52494
Tested-by: Jenkins <[email protected]>
Reviewed-by: Thorsten Behrens <[email protected]>
diff --git a/android/source/src/java/org/libreoffice/ui/FileUtilities.java b/android/source/src/java/org/libreoffice/ui/FileUtilities.java
index 422b1e9..44a9ac0 100644
--- a/android/source/src/java/org/libreoffice/ui/FileUtilities.java
+++ b/android/source/src/java/org/libreoffice/ui/FileUtilities.java
@@ -13,6 +13,7 @@
import java.io.File;
import java.io.FileFilter;
import java.io.FilenameFilter;
import java.text.Collator;
import java.util.Map;
import java.util.Collections;
import java.util.List;
@@ -204,18 +205,20 @@
static void sortFiles(List<IFile> files, int sortMode) {
if (files == null)
return;
// Compare filenames in the default locale
final Collator mCollator = Collator.getInstance();
switch (sortMode) {
case SORT_AZ:
Collections.sort(files , new Comparator<IFile>() {
public int compare(IFile lhs, IFile rhs) {
return lhs.getName().compareTo(rhs.getName());
return mCollator.compare(lhs.getName(), rhs.getName());
}
});
break;
case SORT_ZA:
Collections.sort(files , new Comparator<IFile>() {
public int compare(IFile lhs, IFile rhs) {
return rhs.getName().compareTo(lhs.getName());
return mCollator.compare(rhs.getName(), lhs.getName());
}
});
break;
