From 088e4f90bc6eb04c059072418f598fcfc7371151 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 22 Nov 2023 07:55:34 +0100
Subject: [PATCH] Sort rules first on group

---
 app/src/main/java/eu/faircode/email/AdapterRule.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterRule.java b/app/src/main/java/eu/faircode/email/AdapterRule.java
index 910ce357b3..cafec2345e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterRule.java
+++ b/app/src/main/java/eu/faircode/email/AdapterRule.java
@@ -650,11 +650,16 @@ public class AdapterRule extends RecyclerView.Adapter<AdapterRule.ViewHolder> {
                     order = Integer.compare(r1.order, r2.order);
 
                 if (order == 0)
-                    return collator.compare(
+                    order = collator.compare(
+                            r1.group == null ? "" : r1.group,
+                            r2.group == null ? "" : r2.group);
+
+                if (order == 0)
+                    order = collator.compare(
                             r1.name == null ? "" : r1.name,
                             r2.name == null ? "" : r2.name);
-                else
-                    return order;
+
+                return order;
             }
         });