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 e5e72f75b..fc97b1d7a 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 LOCAL_FIRST = (m1, m2) -> Boolean.compare(m2.getMember().isLocalNumber(), m1.getMember().isLocalNumber()); private static final Comparator ADMIN_FIRST = (m1, m2) -> Boolean.compare(m2.isAdmin(), m1.isAdmin()); + private static final Comparator ALPHABETICAL = (m1, m2) -> m1.getMember().toShortString(ApplicationDependencies.getApplication()).compareToIgnoreCase(m2.getMember().toShortString(ApplicationDependencies.getApplication())); private static final Comparator MEMBER_ORDER = ComparatorCompat.chain(LOCAL_FIRST) - .thenComparing(ADMIN_FIRST); + .thenComparing(ADMIN_FIRST) + .thenComparing(ALPHABETICAL); private final GroupDatabase groupDatabase; private final LiveData recipient;