mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Try to fix occasional sorting crashes

Browse source 
(cherry picked from commit 4e805c8ccc9c721c15571a1f098968dde96cf220)
This commit is contained in:
Stephen Paul Weber 2024-11-18 15:34:16 -05:00 committed by Arne
parent 44d9d9622f
commit 475c556918
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/entities/Bookmark.java
View file

@ -164,6 +164,10 @@ public class Bookmark extends Element implements ListItem {
return 1;
}
if (getDisplayName().equals(another.getDisplayName())) {
return getJid().compareTo(another.getJid());
}
return this.getDisplayName().compareToIgnoreCase(
another.getDisplayName());
}

2
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View file

@ -1403,7 +1403,7 @@ public class StartConversationActivity extends XmppActivity
protected void filter(String needle) {
if (xmppConnectionServiceBound) {
this.filterContacts(needle);
synchronized(this.contacts) { this.filterContacts(needle); }
this.filterConferences(needle);
}
}