cogentleman/xmpp_client
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed behaviour in message parser when doing mam catchup

Browse Source
This commit is contained in:
Daniel Gultsch 2017-02-15 00:08:49 +01:00
parent bb249e0881
commit c7e95d105c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View File

@ -539,7 +539,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
query.incrementActualMessageCount(); query.incrementActualMessageCount();
} }
if (query == null || !query.isCatchup()) { //either no mam or catchup if (query == null || query.isCatchup()) { //either no mam or catchup
if (status == Message.STATUS_SEND || status == Message.STATUS_SEND_RECEIVED) { if (status == Message.STATUS_SEND || status == Message.STATUS_SEND_RECEIVED) {
mXmppConnectionService.markRead(conversation); mXmppConnectionService.markRead(conversation);
if (query == null) { if (query == null) {
@ -581,7 +581,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
} else if (notify) { } else if (notify) {
if (query == null) { if (query == null) {
mXmppConnectionService.getNotificationService().push(message); mXmppConnectionService.getNotificationService().push(message);
} else if (query.getWith() == null) { // mam catchup } else if (query.isCatchup()) { // mam catchup
mXmppConnectionService.getNotificationService().pushFromBacklog(message); mXmppConnectionService.getNotificationService().pushFromBacklog(message);
} }
} }