Merge pull request #43 from siacs/master

copy commits

1 files changed, 16 insertions, 14 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index fe5272b00..2f00083f8 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -154,14 +154,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			fetchBookmarks(account);
 			sendPresence(account);
 			connectMultiModeConversations(account);
-			for (Conversation conversation : account.pendingConferenceLeaves) {
-				leaveMuc(conversation);
-			}
-			account.pendingConferenceLeaves.clear();
-			for (Conversation conversation : account.pendingConferenceJoins) {
-				joinMuc(conversation);
-			}
-			account.pendingConferenceJoins.clear();
 			mMessageArchiveService.executePendingQueries(account);
 			mJingleConnectionManager.cancelInTransmission();
 			syncDirtyContacts(account);
@@ -273,6 +265,14 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						sendUnsentMessages(conversation);
 					}
 				}
+				for (Conversation conversation : account.pendingConferenceLeaves) {
+					leaveMuc(conversation);
+				}
+				account.pendingConferenceLeaves.clear();
+				for (Conversation conversation : account.pendingConferenceJoins) {
+					joinMuc(conversation);
+				}
+				account.pendingConferenceJoins.clear();
 				scheduleWakeUpCall(Config.PING_MAX_INTERVAL, account.getUuid().hashCode());
 			} else if (account.getStatus() == Account.State.OFFLINE) {
 				resetSendingToWaiting(account);
@@ -1471,20 +1471,22 @@ 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();
-				joinMuc(conversation);
+			if (conversation.getMode() == Conversation.MODE_MULTI && conversation.getAccount() == account) {
+				joinMuc(conversation,true);
 			}
 		}
 	}
 
-
 	public void joinMuc(Conversation conversation) {
+		joinMuc(conversation,false);
+	}
+
+	private void joinMuc(Conversation conversation, boolean now) {
 		Account account = conversation.getAccount();
 		account.pendingConferenceJoins.remove(conversation);
 		account.pendingConferenceLeaves.remove(conversation);
-		if (account.getStatus() == Account.State.ONLINE) {
+		if (account.getStatus() == Account.State.ONLINE || now) {
+			conversation.resetMucOptions();
 			final String nick = conversation.getMucOptions().getProposedNick();
 			final Jid joinJid = conversation.getMucOptions().createJoinJid(nick);
 			if (joinJid == null) {