ignore bookmark name of 'None'

1 files changed, 13 insertions, 5 deletions

diff --git a/src/main/java/de/pixart/messenger/entities/Bookmark.java b/src/main/java/de/pixart/messenger/entities/Bookmark.java
index 46b5ace06..309c08e0f 100644
--- a/src/main/java/de/pixart/messenger/entities/Bookmark.java
+++ b/src/main/java/de/pixart/messenger/entities/Bookmark.java
@@ -2,6 +2,7 @@ package de.pixart.messenger.entities;
 
 import android.content.Context;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import java.lang.ref.WeakReference;
 import java.util.ArrayList;
@@ -55,18 +56,25 @@ public class Bookmark extends Element implements ListItem {
     @Override
     public String getDisplayName() {
         final Conversation c = getConversation();
+        final String name = getBookmarkName();
         if (c != null) {
             return c.getName().toString();
-        } else if (getBookmarkName() != null
-                && !getBookmarkName().trim().isEmpty()) {
-            return getBookmarkName().trim();
+        } else if (printableValue(name, false)) {
+            return name.trim();
         } else {
             Jid jid = this.getJid();
-            String name = jid != null ? jid.getLocal() : getAttribute("jid");
-            return name != null ? name : "";
+            return jid != null && jid.getLocal() != null ? jid.getLocal() : "";
         }
     }
 
+    public static boolean printableValue(@Nullable String value, boolean permitNone) {
+        return value != null && !value.trim().isEmpty() && (permitNone || !"None".equals(value));
+    }
+
+    public static boolean printableValue(@Nullable String value) {
+        return printableValue(value, true);
+    }
+
     @Override
     public int getOffline() {
         return 0;