Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-27 16:10:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Folder menu sort order

Browse Source
This commit is contained in:
M66B
2019-03-04 07:48:36 +00:00
parent cfe9f932c2
commit 3fb9b269af
6 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/eu/faircode/email/EntityFolder.java
View File

@@ -333,7 +333,7 @@ public class EntityFolder implements Serializable {
return folder;
}
static void sort(final Context context, List<EntityFolder> folders) {
static void sort(final Context context, List<EntityFolder> folders, final boolean menu) {
final Collator collator = Collator.getInstance(Locale.getDefault());
collator.setStrength(Collator.SECONDARY); // Case insensitive, process accents etc
@@ -345,9 +345,13 @@ public class EntityFolder implements Serializable {
int s = Integer.compare(i1, i2);
if (s != 0)
return s;
int c = -f1.synchronize.compareTo(f2.synchronize);
if (c != 0)
return c;
if (!menu) {
int c = -f1.synchronize.compareTo(f2.synchronize);
if (c != 0)
return c;
}
String name1 = f1.getDisplayName(context);
String name2 = f2.getDisplayName(context);
return collator.compare(name1, name2);