diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/entities/Conversation.java')
-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 3df78fde0..1bfb50034 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -509,12 +509,13 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl public String getName() { if (getMode() == MODE_MULTI) { - if (getMucOptions().getSubject() != null) { - return getMucOptions().getSubject(); - } else if (bookmark != null - && bookmark.getBookmarkName() != null - && !bookmark.getBookmarkName().trim().isEmpty()) { - return bookmark.getBookmarkName().trim(); + final String subject = getMucOptions().getSubject(); + final String bookmarkName = bookmark != null ? bookmark.getBookmarkName() : null; + + if (subject != null && !subject.trim().isEmpty()) { + return subject; + } else if (bookmarkName != null && !bookmarkName.trim().isEmpty()) { + return bookmarkName; } else { String generatedName = getMucOptions().createNameFromParticipants(); if (generatedName != null) { |