sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Daniel Gultsch 2018-04-18 10:24:57 +02:00
parent 71461543a3
commit 5170e526c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/entities/Conversation.java
View File

@ -484,7 +484,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
} }
} }
public CharSequence getName() { public @NonNull CharSequence getName() {
if (getMode() == MODE_MULTI) { if (getMode() == MODE_MULTI) {
final String subject = getMucOptions().getSubject(); final String subject = getMucOptions().getSubject();
final Bookmark bookmark = getBookmark(); final Bookmark bookmark = getBookmark();
@ -498,7 +498,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
if (printableValue(generatedName)) { if (printableValue(generatedName)) {
return generatedName; return generatedName;
} else { } else {
return getJid().getLocal(); return contactJid.getLocal() != null ? contactJid.getLocal() : contactJid;
} }
} }
} else if (isWithStranger()) { } else if (isWithStranger()) {