From 0f19def2183d260238d998b4c35e648e65e3ce11 Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Mon, 16 Dec 2024 14:02:25 -0500 Subject: [PATCH] Fix NPE --- src/main/java/eu/siacs/conversations/entities/Contact.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/entities/Contact.java b/src/main/java/eu/siacs/conversations/entities/Contact.java index f4677da331d5010a9741ea27da1761394734d004..ceb15b3a31877761dedf77ef89a534ca2c13e639 100644 --- a/src/main/java/eu/siacs/conversations/entities/Contact.java +++ b/src/main/java/eu/siacs/conversations/entities/Contact.java @@ -526,8 +526,8 @@ public class Contact implements ListItem, Blockable { return getJid().compareTo(another.getJid()); } - return this.getDisplayName().compareToIgnoreCase( - another.getDisplayName()); + final var anotherName = another.getDisplayName(); + return this.getDisplayName().compareToIgnoreCase(anotherName == null ? "" : anotherName); } public String getServer() {