sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reset muc options immediately befor join

This commit is contained in:
Daniel Gultsch 2015-10-01 13:03:15 +02:00
parent f2ccf073bd
commit 6a0b9971aa
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -1471,9 +1471,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
private void connectMultiModeConversations(Account account) { private void connectMultiModeConversations(Account account) {
List<Conversation> conversations = getConversations(); List<Conversation> conversations = getConversations();
for (Conversation conversation : conversations) { for (Conversation conversation : conversations) {
if ((conversation.getMode() == Conversation.MODE_MULTI) if (conversation.getMode() == Conversation.MODE_MULTI && conversation.getAccount() == account) {
&& (conversation.getAccount() == account)) {
conversation.resetMucOptions();
joinMuc(conversation); joinMuc(conversation);
} }
} }
@ -1485,6 +1483,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
account.pendingConferenceJoins.remove(conversation); account.pendingConferenceJoins.remove(conversation);
account.pendingConferenceLeaves.remove(conversation); account.pendingConferenceLeaves.remove(conversation);
if (account.getStatus() == Account.State.ONLINE) { if (account.getStatus() == Account.State.ONLINE) {
conversation.resetMucOptions();
final String nick = conversation.getMucOptions().getProposedNick(); final String nick = conversation.getMucOptions().getProposedNick();
final Jid joinJid = conversation.getMucOptions().createJoinJid(nick); final Jid joinJid = conversation.getMucOptions().createJoinJid(nick);
if (joinJid == null) { if (joinJid == null) {