diff options
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java b/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java index 25d0669ed..9e4cdc680 100644 --- a/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java +++ b/src/main/java/de/pixart/messenger/ui/ChannelDiscoveryActivity.java @@ -226,16 +226,17 @@ public class ChannelDiscoveryActivity extends XmppActivity implements MenuItem.O final boolean syncAutoJoin = getBooleanPreference("autojoin", R.bool.autojoin); final Account account = xmppConnectionService.findAccountByJid(jid); final Conversation conversation = xmppConnectionService.findOrCreateConversation(account, result.getRoom(), true, true, true); - if (conversation.getBookmark() != null) { - if (!conversation.getBookmark().autojoin() && syncAutoJoin) { + Bookmark bookmark = conversation.getBookmark(); + if (bookmark != null) { + if (!bookmark.autojoin() && syncAutoJoin) { conversation.getBookmark().setAutojoin(true); - xmppConnectionService.pushBookmarks(account); + xmppConnectionService.createBookmark(account, bookmark); } } else { - final Bookmark bookmark = new Bookmark(account, conversation.getJid().asBareJid()); + bookmark = new Bookmark(account, conversation.getJid().asBareJid()); bookmark.setAutojoin(syncAutoJoin); account.getBookmarks().add(bookmark); - xmppConnectionService.pushBookmarks(account); + xmppConnectionService.createBookmark(account, bookmark); } switchToConversation(conversation); } |