diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-10-01 13:03:15 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-10-01 13:03:15 +0200 |
| commit | 6a0b9971aa81504e2b52c67e793efce5071e8c9f (patch) | |
| tree | ab9f0990a083937d041fa44e8247604c2813b616 | |
| parent | f2ccf073bd81e55f1e5ab563c466d0f7dc1beb5a (diff) | |
reset muc options immediately befor join
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index fe5272b0..dabfff4d 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1471,9 +1471,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa private void connectMultiModeConversations(Account account) { List<Conversation> conversations = getConversations(); for (Conversation conversation : conversations) { - if ((conversation.getMode() == Conversation.MODE_MULTI) - && (conversation.getAccount() == account)) { - conversation.resetMucOptions(); + if (conversation.getMode() == Conversation.MODE_MULTI && conversation.getAccount() == account) { joinMuc(conversation); } } @@ -1485,6 +1483,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa account.pendingConferenceJoins.remove(conversation); account.pendingConferenceLeaves.remove(conversation); if (account.getStatus() == Account.State.ONLINE) { + conversation.resetMucOptions(); final String nick = conversation.getMucOptions().getProposedNick(); final Jid joinJid = conversation.getMucOptions().createJoinJid(nick); if (joinJid == null) { |