fixed npe when conversation in multi mode had jid w/o local part

1 files changed, 2 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java
index 1e87b7ec5..705b14cc3 100644
--- a/src/main/java/de/pixart/messenger/entities/Conversation.java
+++ b/src/main/java/de/pixart/messenger/entities/Conversation.java
@@ -516,7 +516,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
         }
     }
 
-    public CharSequence getName() {
+    public @NonNull CharSequence getName() {
         if (getMode() == MODE_MULTI) {
             final String subject = getMucOptions().getSubject();
             final Bookmark bookmark = getBookmark();
@@ -530,7 +530,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
                 if (printableValue(generatedName)) {
                     return generatedName;
                 } else {
-                    return getJid().getLocal();
+                    return contactJid.getLocal() != null ? contactJid.getLocal() : contactJid;
                 }
             }
         } else if (isWithStranger()) {