From 550fbc6d2c6c61d781a9da56bed9323498fbe8dd Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Fri, 22 May 2020 13:22:22 +0200 Subject: [PATCH] make sure automatic jmi responses are sent before ack --- .../java/eu/siacs/conversations/parser/MessageParser.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java index beeb2f39e..37cf7ed33 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -837,13 +837,13 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece if (Namespace.JINGLE_MESSAGE.equals(child.getNamespace()) && JINGLE_MESSAGE_ELEMENT_NAMES.contains(child.getName())) { final String action = child.getName(); if (query == null) { - if (!account.getJid().asBareJid().equals(from.asBareJid())) { - processMessageReceipts(account, packet, query); - } if (serverMsgId == null) { serverMsgId = extractStanzaId(account, packet); } mXmppConnectionService.getJingleConnectionManager().deliverMessage(account, packet.getTo(), packet.getFrom(), child, remoteMsgId, serverMsgId, timestamp); + if (!account.getJid().asBareJid().equals(from.asBareJid())) { + processMessageReceipts(account, packet, query); + } } else if (query.isCatchup()) { final String sessionId = child.getAttribute("id"); if (sessionId == null) {