From e26d84254979101374c5abb4a8788c9dd7e6349d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 3 Jun 2016 18:43:45 +0200
Subject: don't use a bookmarks name if it's empty

---
 src/main/java/eu/siacs/conversations/entities/Bookmark.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/entities/Bookmark.java')

diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
index c5c4ff5d..f5cfba3a 100644
--- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java
+++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
@@ -52,8 +52,9 @@ public class Bookmark extends Element implements ListItem {
 	public String getDisplayName() {
 		if (this.mJoinedConversation != null) {
 			return this.mJoinedConversation.getName();
-		} else if (getBookmarkName() != null) {
-			return getBookmarkName();
+		} else if (getBookmarkName() != null
+				&& !getBookmarkName().trim().isEmpty()) {
+			return getBookmarkName().trim();
 		} else {
 			return this.getJid().getLocalpart();
 		}
-- 
cgit v1.2.3