From 6e62b62b80b8ab833587fabb30028e958f44ab2f Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Wed, 15 Feb 2017 12:09:36 +0100 Subject: [PATCH] respond to xep-0184 requests in muc pms --- .../java/eu/siacs/conversations/parser/MessageParser.java | 8 ++++++-- 1 file changed, 6 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 ad2c97d5b..c0dfac809 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -501,7 +501,11 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece } mXmppConnectionService.updateMessage(replacedMessage, uuid); mXmppConnectionService.getNotificationService().updateNotification(false); - if (mXmppConnectionService.confirmMessages() && remoteMsgId != null && !isForwarded && !isTypeGroupChat) { + if (mXmppConnectionService.confirmMessages() + && (replacedMessage.trusted() || replacedMessage.getType() == Message.TYPE_PRIVATE) + && remoteMsgId != null + && !isForwarded + && !isTypeGroupChat) { sendMessageReceipts(account, packet); } if (replacedMessage.getEncryption() == Message.ENCRYPTION_PGP) { @@ -560,7 +564,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece } if (mXmppConnectionService.confirmMessages() - && message.trusted() + && (message.trusted() || message.getType() == Message.TYPE_PRIVATE) && remoteMsgId != null && !isForwarded && !isTypeGroupChat) {