From 9acdc377299d99c75a2ec4cbf0bc055e8616ac77 Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Tue, 26 May 2020 16:49:19 -0300
Subject: [PATCH] Alphabetical member order.

---
 .../java/org/thoughtcrime/securesms/groups/LiveGroup.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java b/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java
index e5e72f75b6..fc97b1d7ac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/LiveGroup.java
@@ -29,8 +29,10 @@ public final class LiveGroup {
 
   private static final Comparator<GroupMemberEntry.FullMember>         LOCAL_FIRST  = (m1, m2) -> Boolean.compare(m2.getMember().isLocalNumber(), m1.getMember().isLocalNumber());
   private static final Comparator<GroupMemberEntry.FullMember>         ADMIN_FIRST  = (m1, m2) -> Boolean.compare(m2.isAdmin(), m1.isAdmin());
+  private static final Comparator<GroupMemberEntry.FullMember>         ALPHABETICAL = (m1, m2) -> m1.getMember().toShortString(ApplicationDependencies.getApplication()).compareToIgnoreCase(m2.getMember().toShortString(ApplicationDependencies.getApplication()));
   private static final Comparator<? super GroupMemberEntry.FullMember> MEMBER_ORDER = ComparatorCompat.chain(LOCAL_FIRST)
-                                                                                                      .thenComparing(ADMIN_FIRST);
+                                                                                                      .thenComparing(ADMIN_FIRST)
+                                                                                                      .thenComparing(ALPHABETICAL);
 
   private final GroupDatabase                       groupDatabase;
   private final LiveData<Recipient>                 recipient;