diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-05-26 22:53:55 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-05-26 22:53:55 +0200 |
| commit | 21ebb35e44ee2e6a6cffaffee737d537ab1b8d6b (patch) | |
| tree | 4edf3e780709efdce46ccfe5c7cc92e556d8af83 /src/main/java/eu/siacs/conversations/entities | |
| parent | d9ff61ea2e2a54e7ac17f13b56016a75c04fc734 (diff) | |
add 'create conference' dialog
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Bookmark.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java index fd6a5dab..c5c4ff5d 100644 --- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java +++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java @@ -50,9 +50,8 @@ public class Bookmark extends Element implements ListItem { @Override public String getDisplayName() { - if (this.mJoinedConversation != null - && (this.mJoinedConversation.getMucOptions().getSubject() != null)) { - return this.mJoinedConversation.getMucOptions().getSubject(); + if (this.mJoinedConversation != null) { + return this.mJoinedConversation.getName(); } else if (getBookmarkName() != null) { return getBookmarkName(); } else { |