From 649b52222a4cecbb184eb7bea3cf685fac2801df Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Fri, 13 Apr 2018 21:52:26 +0200 Subject: ignore bookmark name of 'None' --- .../java/de/pixart/messenger/entities/Conversation.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/main/java/de/pixart/messenger/entities/Conversation.java') diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index 91257c6ff..d10868bf7 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -32,6 +32,8 @@ import de.pixart.messenger.xmpp.chatstate.ChatState; import de.pixart.messenger.xmpp.mam.MamReference; import rocks.xmpp.addr.Jid; +import static de.pixart.messenger.entities.Bookmark.printableValue; + public class Conversation extends AbstractEntity implements Blockable, Comparable { public static final String TABLENAME = "conversations"; @@ -511,16 +513,15 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl public CharSequence getName() { if (getMode() == MODE_MULTI) { final String subject = getMucOptions().getSubject(); - Bookmark bookmark = getBookmark(); + final Bookmark bookmark = getBookmark(); final String bookmarkName = bookmark != null ? bookmark.getBookmarkName() : null; - - if (subject != null && !subject.trim().isEmpty()) { + if (printableValue(subject)) { return subject; - } else if (bookmarkName != null && !bookmarkName.trim().isEmpty()) { + } else if (printableValue(bookmarkName, false)) { return bookmarkName; } else { - String generatedName = getMucOptions().createNameFromParticipants(); - if (generatedName != null) { + final String generatedName = getMucOptions().createNameFromParticipants(); + if (printableValue(generatedName)) { return generatedName; } else { return getJid().getLocal(); -- cgit v1.2.3