sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do mam query after join

This commit is contained in:
Daniel Gultsch 2015-10-06 16:58:56 +02:00
parent fd61d67dab
commit 8f066d00e0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
View File

@ -1510,7 +1510,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
if (conversation.getMucOptions().mamSupport()) { if (conversation.getMucOptions().mamSupport()) {
// Use MAM instead of the limited muc history to get history // Use MAM instead of the limited muc history to get history
x.addChild("history").setAttribute("maxchars", "0"); x.addChild("history").setAttribute("maxchars", "0");
getMessageArchiveService().catchupMUC(conversation);
} else { } else {
// Fallback to muc history // Fallback to muc history
x.addChild("history").setAttribute("since", PresenceGenerator.getTimestamp(conversation.getLastMessageTransmitted())); x.addChild("history").setAttribute("since", PresenceGenerator.getTimestamp(conversation.getLastMessageTransmitted()));
@ -1527,6 +1526,9 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
databaseBackend.updateConversation(conversation); databaseBackend.updateConversation(conversation);
} }
conversation.setHasMessagesLeftOnServer(false); conversation.setHasMessagesLeftOnServer(false);
if (conversation.getMucOptions().mamSupport()) {
getMessageArchiveService().catchupMUC(conversation);
}
} }
}); });