diff options
author | Daniel Gultsch <daniel@gultsch.de> | 2015-12-12 16:01:33 +0100 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2015-12-13 12:43:57 +0100 |
commit | efaa1223b6e002d5afba0462d57ff30be91dd0e5 (patch) | |
tree | 8f2575fee437548bba414d19e1785c630d7d7ac4 | |
parent | 207b5921d9b4c1cd33adecdb89445df53c012afd (diff) |
changed order of send presence and execute mam queries
-rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 4 |
1 files 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); } }; |