Try to fix occasional sorting crashes

Stephen Paul Weber created 11 months ago

Change summary

src/main/java/eu/siacs/conversations/entities/Bookmark.java            | 4 
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java | 2 
2 files changed, 5 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/entities/Bookmark.java

@@ -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());
 	}

src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java

@@ -1319,7 +1319,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);
         }
     }