aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-12-12 16:01:33 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-12-12 16:01:33 +0100
commit50817956c2c0c855cb75b97d6a0078a58bfd6d36 (patch)
tree4e18ac7f889677e3de39c754c5bf7289f3ad63b6 /src/main/java/eu/siacs
parent88523bbb5073867be3faeed27d4b7def1263205b (diff)
changed order of send presence and execute mam queries
Diffstat (limited to 'src/main/java/eu/siacs')
-rw-r--r--src/main/java/eu/siacs/conversations/services/XmppConnectionService.java4
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 3be56b04..9ecdf6ae 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);
}
};