From c7e95d105c6dbfe94723613ce8cc9112fb0487df Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 15 Feb 2017 00:08:49 +0100 Subject: [PATCH] fixed behaviour in message parser when doing mam catchup --- .../java/eu/siacs/conversations/parser/MessageParser.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java index f49a7bb72..ad2c97d5b 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -539,7 +539,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece 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) { mXmppConnectionService.markRead(conversation); if (query == null) { @@ -581,7 +581,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece } else if (notify) { if (query == null) { mXmppConnectionService.getNotificationService().push(message); - } else if (query.getWith() == null) { // mam catchup + } else if (query.isCatchup()) { // mam catchup mXmppConnectionService.getNotificationService().pushFromBacklog(message); } }