narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

respond to xep-0184 requests in muc pms

Browse source
This commit is contained in:
Daniel Gultsch 2017-02-15 12:09:36 +01:00
parent c7e95d105c
commit 6e62b62b80
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/parser/MessageParser.java
View file

@ -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) {