do not cross reference bookmarks and conversations

1 files changed, 8 insertions, 5 deletions

diff --git a/src/main/java/de/pixart/messenger/entities/Account.java b/src/main/java/de/pixart/messenger/entities/Account.java
index bc2fe371a..c641902a3 100644
--- a/src/main/java/de/pixart/messenger/entities/Account.java
+++ b/src/main/java/de/pixart/messenger/entities/Account.java
@@ -612,18 +612,21 @@ public class Account extends AbstractEntity {
         return this.bookmarks;
     }
 
-    public void setBookmarks(final List<Bookmark> bookmarks) {
+    public void setBookmarks(final CopyOnWriteArrayList<Bookmark> bookmarks) {
         this.bookmarks = bookmarks;
     }
 
     public boolean hasBookmarkFor(final Jid conferenceJid) {
+        return getBookmark(conferenceJid) != null;
+    }
+
+    public Bookmark getBookmark(final Jid jid) {
         for (final Bookmark bookmark : this.bookmarks) {
-            final Jid jid = bookmark.getJid();
-            if (jid != null && jid.equals(conferenceJid.toBareJid())) {
-                return true;
+            if (bookmark.getJid() != null && jid.toBareJid().equals(bookmark.getJid().toBareJid())) {
+                return bookmark;
             }
         }
-        return false;
+        return null;
     }
 
     public boolean setAvatar(final String filename) {