Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7be0dbd8 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Sort channels and groups by id

Test: manual
Change-Id: I3949e9eb7b901bd897d848627682878937aac0c1
parent 4c4f2a7c
Loading
Loading
Loading
Loading
+0 −11
Original line number Diff line number Diff line
@@ -269,11 +269,6 @@ public class AppNotificationSettings extends NotificationSettingsBase {
            if (left.isDeleted() != right.isDeleted()) {
                return Boolean.compare(left.isDeleted(), right.isDeleted());
            }
            CharSequence leftName = left.getName();
            CharSequence rightName = right.getName();
            if (!Objects.equals(leftName, rightName)) {
                return sCollator.compare(leftName.toString(), rightName.toString());
            }
            return left.getId().compareTo(right.getId());
        }
    };
@@ -290,12 +285,6 @@ public class AppNotificationSettings extends NotificationSettingsBase {
                    } else if (right.getId() == null && left.getId() != null) {
                        return -1;
                    }
                    CharSequence leftName = left.getName();
                    CharSequence rightName = right.getName();
                    // sort rest of the groups by name
                    if (!Objects.equals(leftName, rightName)) {
                        return sCollator.compare(leftName.toString(), rightName.toString());
                    }
                    return left.getId().compareTo(right.getId());
                }
            };