msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Fixed sorting folders

Browse Source
pull/156/head
M66B 6 years ago
parent 7c304c96b2
commit 106f14b39c
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File

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

@ -74,11 +74,17 @@ public class TupleFolderEx extends EntityFolder implements Serializable {
else if (f2.accountName == null) else if (f2.accountName == null)
return -1; 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, f1.accountOrder == null ? -1 : f1.accountOrder,
f2.accountOrder == null ? -1 : f2.accountOrder); f2.accountOrder == null ? -1 : f2.accountOrder);
if (o != 0) if (ao != 0)
return o; return ao;
int a = collator.compare(f1.accountName, f2.accountName); int a = collator.compare(f1.accountName, f2.accountName);
if (a != 0) if (a != 0)

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

@ -54,11 +54,17 @@ public class TupleFolderNav extends EntityFolder implements Serializable {
else if (f2.accountName == null) else if (f2.accountName == null)
return -1; 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, f1.accountOrder == null ? -1 : f1.accountOrder,
f2.accountOrder == null ? -1 : f2.accountOrder); f2.accountOrder == null ? -1 : f2.accountOrder);
if (o != 0) if (ao != 0)
return o; return ao;
int a = collator.compare(f1.accountName, f2.accountName); int a = collator.compare(f1.accountName, f2.accountName);
if (a != 0) if (a != 0)

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

@ -55,11 +55,17 @@ public class TupleFolderSort extends EntityFolder {
else if (f2.accountName == null) else if (f2.accountName == null)
return -1; 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, f1.accountOrder == null ? -1 : f1.accountOrder,
f2.accountOrder == null ? -1 : f2.accountOrder); f2.accountOrder == null ? -1 : f2.accountOrder);
if (o != 0) if (ao != 0)
return o; return ao;
int a = collator.compare(f1.accountName, f2.accountName); int a = collator.compare(f1.accountName, f2.accountName);
if (a != 0) if (a != 0)

Write Preview
Loading…
Cancel
Save