Fixed sorting folders

5 years ago · 106f14b39c
parent 7c304c96b2
commit 106f14b39c
3 changed files with 27 additions and 9 deletions
--- a/app/src/main/java/eu/faircode/email/TupleFolderEx.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderEx.java
@ -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)
--- a/app/src/main/java/eu/faircode/email/TupleFolderNav.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderNav.java
@ -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)
--- a/app/src/main/java/eu/faircode/email/TupleFolderSort.java
+++ b/app/src/main/java/eu/faircode/email/TupleFolderSort.java
@ -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)