Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-27 11:25:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consistent folder ordering

Browse Source
This commit is contained in:
M66B
2022-03-24 13:57:28 +01:00
parent 1be4a5d031
commit 9613cd2b27
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java
View File

@@ -321,13 +321,6 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
// Folder
if (a1.folderName == null && a2.folderName == null)
return 0;
else if (a1.folderName == null)
return -1;
else if (a2.folderName == null)
return 1;
int o = Integer.compare(
a1.folderOrder == null ? -1 : a1.folderOrder,
a2.folderOrder == null ? -1 : a2.folderOrder);
@@ -344,6 +337,13 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
if (s != 0)
return s;
if (a1.folderName == null && a2.folderName == null)
return 0;
else if (a1.folderName == null)
return -1;
else if (a2.folderName == null)
return 1;
return collator.compare(a1.getName(context), a2.getName(context));
}
});