mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-03 18:26:20 +00:00
Code Issues Releases Wiki Activity

Fixed sorting folders

Browse source
This commit is contained in:
M66B 2019-05-08 20:21:12 +02:00
parent 7c304c96b2
commit 106f14b39c
3 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/eu/faircode/email/TupleFolderEx.java
View file

@ -74,11 +74,17 @@ public class TupleFolderEx extends EntityFolder implements Serializable {
else if (f2.accountName == null)
return -1;
int o = Integer.compare(
int fo = Integer.compare(
f1.order == null ? -1 : f1.order,
f2.order == null ? -1 : f2.order);
if (fo != 0)
return fo;
int ao = Integer.compare(
f1.accountOrder == null ? -1 : f1.accountOrder,
f2.accountOrder == null ? -1 : f2.accountOrder);
if (o != 0)
return o;
if (ao != 0)
return ao;
int a = collator.compare(f1.accountName, f2.accountName);
if (a != 0)

12
app/src/main/java/eu/faircode/email/TupleFolderNav.java
View file

@ -54,11 +54,17 @@ public class TupleFolderNav extends EntityFolder implements Serializable {
else if (f2.accountName == null)
return -1;
int o = Integer.compare(
int fo = Integer.compare(
f1.order == null ? -1 : f1.order,
f2.order == null ? -1 : f2.order);
if (fo != 0)
return fo;
int ao = Integer.compare(
f1.accountOrder == null ? -1 : f1.accountOrder,
f2.accountOrder == null ? -1 : f2.accountOrder);
if (o != 0)
return o;
if (ao != 0)
return ao;
int a = collator.compare(f1.accountName, f2.accountName);
if (a != 0)

12
app/src/main/java/eu/faircode/email/TupleFolderSort.java
View file

@ -55,11 +55,17 @@ public class TupleFolderSort extends EntityFolder {
else if (f2.accountName == null)
return -1;
int o = Integer.compare(
int fo = Integer.compare(
f1.order == null ? -1 : f1.order,
f2.order == null ? -1 : f2.order);
if (fo != 0)
return fo;
int ao = Integer.compare(
f1.accountOrder == null ? -1 : f1.accountOrder,
f2.accountOrder == null ? -1 : f2.accountOrder);
if (o != 0)
return o;
if (ao != 0)
return ao;
int a = collator.compare(f1.accountName, f2.accountName);
if (a != 0)