diff options
| author | Christian Schneppe <christian@pix-art.de> | 2018-05-17 20:47:00 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2018-05-17 20:47:00 +0200 |
| commit | e4128f1227832580702a53f8ce3909b1f378ef79 (patch) | |
| tree | f799d4b11d099dc9e402d9b8a4d0c2c62565c733 /src/main/java/de/pixart/messenger/parser/MessageParser.java | |
| parent | 3317246086142c339ca41e2d6776b5363322f4e1 (diff) | |
do not use end in catchup mam queries
Diffstat (limited to 'src/main/java/de/pixart/messenger/parser/MessageParser.java')
| -rw-r--r-- | src/main/java/de/pixart/messenger/parser/MessageParser.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java index f09c82473..701dd860e 100644 --- a/src/main/java/de/pixart/messenger/parser/MessageParser.java +++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java @@ -629,7 +629,8 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece boolean checkForDuplicates = (isTypeGroupChat && packet.hasChild("delay", "urn:xmpp:delay")) || message.getType() == Message.TYPE_PRIVATE - || message.getServerMsgId() != null; + || message.getServerMsgId() != null + || (query == null && mXmppConnectionService.getMessageArchiveService().isCatchupInProgress(conversation)); if (checkForDuplicates) { final Message duplicate = conversation.findDuplicateMessage(message); if (duplicate != null) { |