diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-10-06 16:58:56 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-10-06 16:58:56 +0200 |
| commit | 8f066d00e0ae10dda5123caaf001d2b34309ec1d (patch) | |
| tree | 3810550b64c39c0997310cbd0cd49422a876df75 /src/main/java/eu/siacs | |
| parent | fd61d67dabcb54511f6aa29079ea68d222e59345 (diff) | |
do mam query after join
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 4 |
1 files changed, 3 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 dfd7d112..8326766e 100644 --- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java +++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java @@ -1510,7 +1510,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa if (conversation.getMucOptions().mamSupport()) { // Use MAM instead of the limited muc history to get history x.addChild("history").setAttribute("maxchars", "0"); - getMessageArchiveService().catchupMUC(conversation); } else { // Fallback to muc history x.addChild("history").setAttribute("since", PresenceGenerator.getTimestamp(conversation.getLastMessageTransmitted())); @@ -1527,6 +1526,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa databaseBackend.updateConversation(conversation); } conversation.setHasMessagesLeftOnServer(false); + if (conversation.getMucOptions().mamSupport()) { + getMessageArchiveService().catchupMUC(conversation); + } } }); |