fixed race condition that prevented bookmark nick to be used

1 files changed, 11 insertions, 1 deletions

diff --git a/src/main/java/de/pixart/messenger/entities/Bookmark.java b/src/main/java/de/pixart/messenger/entities/Bookmark.java
index fc7725bb5..e670673dd 100644
--- a/src/main/java/de/pixart/messenger/entities/Bookmark.java
+++ b/src/main/java/de/pixart/messenger/entities/Bookmark.java
@@ -87,6 +87,11 @@ public class Bookmark extends Element implements ListItem {
         return this.jid;
     }
 
+    public Jid getFullJid() {
+        final String nick = getNick();
+        return jid == null || nick == null || nick.trim().isEmpty() ? jid : jid.withResource(nick);
+    }
+
     @Override
     public List<Tag> getTags(Context context) {
         ArrayList<Tag> tags = new ArrayList<>();
@@ -160,7 +165,12 @@ public class Bookmark extends Element implements ListItem {
         if (this.conversation != null) {
             this.conversation.clear();
         }
-        this.conversation = new WeakReference<>(conversation);
+        if (conversation == null) {
+            this.conversation = null;
+        } else {
+            this.conversation = new WeakReference<>(conversation);
+            conversation.getMucOptions().notifyOfBookmarkNick(getNick());
+        }
     }
 
     public String getBookmarkName() {