diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-13 21:52:26 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-13 21:52:26 +0200 |
commit | 649b52222a4cecbb184eb7bea3cf685fac2801df (patch) | |
tree | 99ff28b5cb936ab9f17ae247b280bde4054e4c8d /src/main/java/de/pixart/messenger/entities/Conversation.java | |
parent | db5a5bac17440231821f2e9d480046d7ac210047 (diff) |
ignore bookmark name of 'None'
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/entities/Conversation.java | 13 |
1 files changed, 7 insertions, 6 deletions
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<Conversation> { 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(); |