From 15ebf4728702243fb94445a45bb0526061f103b9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 24 Mar 2022 19:25:51 +0100
Subject: [PATCH] First categorize accounts

---
 .../faircode/email/AdapterNavAccountFolder.java  | 16 ++++++++--------
 .../main/java/eu/faircode/email/DaoAccount.java  |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java b/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java
index 02c2562655..c932a9ca81 100644
--- a/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterNavAccountFolder.java
@@ -302,6 +302,14 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
                 public int compare(TupleAccountFolder a1, TupleAccountFolder a2) {
                     // Account
 
+                    if (nav_categories) {
+                        int c = collator.compare(
+                                a1.category == null ? "" : a1.category,
+                                a2.category == null ? "" : a2.category);
+                        if (c != 0)
+                            return c;
+                    }
+
                     int a = Integer.compare(
                             a1.order == null ? -1 : a1.order,
                             a2.order == null ? -1 : a2.order);
@@ -312,14 +320,6 @@ public class AdapterNavAccountFolder extends RecyclerView.Adapter<AdapterNavAcco
                     if (p != 0)
                         return p;
 
-                    if (nav_categories) {
-                        int c = collator.compare(
-                                a1.category == null ? "" : a1.category,
-                                a2.category == null ? "" : a2.category);
-                        if (c != 0)
-                            return c;
-                    }
-
                     int n = collator.compare(a1.name, a2.name);
                     if (n != 0)
                         return n;
diff --git a/app/src/main/java/eu/faircode/email/DaoAccount.java b/app/src/main/java/eu/faircode/email/DaoAccount.java
index 68789664cd..f56a8ea614 100644
--- a/app/src/main/java/eu/faircode/email/DaoAccount.java
+++ b/app/src/main/java/eu/faircode/email/DaoAccount.java
@@ -74,9 +74,9 @@ public interface DaoAccount {
             " LEFT JOIN folder AS sent ON sent.account = account.id AND sent.type = '" + EntityFolder.SENT + "'" +
             " WHERE :all OR account.synchronize" +
             " GROUP BY account.id" +
-            " ORDER BY account.`order`" +
+            " ORDER BY account.category COLLATE NOCASE" +
+            ", account.`order`" +
             ", account.`primary` DESC" +
-            ", account.category COLLATE NOCASE" +
             ", account.name COLLATE NOCASE")
     LiveData<List<TupleAccountEx>> liveAccountsEx(boolean all);