From 206e3be3386a5728d73a0d96b8d759135be0cb88 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Sun, 29 Jan 2023 22:02:29 -0500 Subject: [PATCH] compareTo have to match on all items or sort may explode --- src/main/java/eu/siacs/conversations/entities/Bookmark.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java index 15872eafc1cbeaaa210f89d3a9733489c8d38f0f..1f416a41872f9c122fb81e822676bd5f6e99c113 100644 --- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java +++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java @@ -154,6 +154,12 @@ public class Bookmark extends Element implements ListItem { @Override public int compareTo(final @NonNull ListItem another) { + if (getJid().isDomainJid() && !another.getJid().isDomainJid()) { + return -1; + } else if (!getJid().isDomainJid() && another.getJid().isDomainJid()) { + return 1; + } + return this.getDisplayName().compareToIgnoreCase( another.getDisplayName()); }