diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-12-11 19:28:44 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-12-12 15:53:43 +0100 |
| commit | 1f47a03294f6e59bfa9f0f79343736a1f726d1c8 (patch) | |
| tree | 0d03380be8d520f19498f77b22ce7319dfdfd98a /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
| parent | 459984c47c064a6392132a4b50d129a5b9d0c4ff (diff) | |
set bookmark name to room subject if no subject has been set before
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java index cb193167a..3be56b042 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -250,9 +250,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa account.getRoster().clearPresences(); fetchRosterFromServer(account); fetchBookmarks(account); + mMessageArchiveService.executePendingQueries(account); sendPresence(account); connectMultiModeConversations(account); - mMessageArchiveService.executePendingQueries(account); mJingleConnectionManager.cancelInTransmission(); syncDirtyContacts(account); } @@ -1015,6 +1015,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa } public void pushBookmarks(Account account) { + Log.d(Config.LOGTAG, account.getJid().toBareJid()+": pushing bookmarks"); IqPacket iqPacket = new IqPacket(IqPacket.TYPE.SET); Element query = iqPacket.query("jabber:iq:private"); Element storage = query.addChild("storage", "storage:bookmarks"); |