diff options
Diffstat (limited to '')
3 files changed, 4 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 29f7a3c26..6b4bea4e9 100644 --- a/src/main/java/de/pixart/messenger/entities/Bookmark.java +++ b/src/main/java/de/pixart/messenger/entities/Bookmark.java @@ -172,5 +172,6 @@ public class Bookmark extends Element implements ListItem { if (this.mJoinedConversation != null) { this.mJoinedConversation.deregisterWithBookmark(); } + this.mJoinedConversation = null; } } diff --git a/src/main/java/de/pixart/messenger/entities/Conversation.java b/src/main/java/de/pixart/messenger/entities/Conversation.java index f654902b4..52525e481 100644 --- a/src/main/java/de/pixart/messenger/entities/Conversation.java +++ b/src/main/java/de/pixart/messenger/entities/Conversation.java @@ -817,6 +817,7 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl if (this.bookmark != null) { this.bookmark.setConversation(null); } + this.bookmark = null; } public Bookmark getBookmark() { diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java index 8db6eafd8..2050a6ddc 100644 --- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java @@ -506,9 +506,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers protected void deleteBookmark() { Account account = mConversation.getAccount(); Bookmark bookmark = mConversation.getBookmark(); - bookmark.unregisterConversation(); + mConversation.deregisterWithBookmark(); account.getBookmarks().remove(bookmark); xmppConnectionService.pushBookmarks(account); + updateView(); } @Override |