From 50817956c2c0c855cb75b97d6a0078a58bfd6d36 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 12 Dec 2015 16:01:33 +0100 Subject: [PATCH] changed order of send presence and execute mam queries --- .../siacs/conversations/services/XmppConnectionService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index 3be56b042..9ecdf6ae8 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -248,12 +248,12 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa @Override public void onBind(final Account account) { account.getRoster().clearPresences(); + mJingleConnectionManager.cancelInTransmission(); fetchRosterFromServer(account); fetchBookmarks(account); - mMessageArchiveService.executePendingQueries(account); sendPresence(account); + mMessageArchiveService.executePendingQueries(account); connectMultiModeConversations(account); - mJingleConnectionManager.cancelInTransmission(); syncDirtyContacts(account); } };