aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/parser/MessageParser.java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-10-07 10:05:08 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-10-07 10:05:08 +0200
commit1f7f82da7b4e98e76588721d16ebf2b3e42e9084 (patch)
treec2196a384e58ef9c33087cf757a1a39ec2d0bbc7 /src/main/java/eu/siacs/conversations/parser/MessageParser.java
parent26e33de79aad9bd688e1fdfdf0108a962cdc3244 (diff)
respond to chat marker request only when mutual presence subscription exists
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser/MessageParser.java')
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 86b7a7dc..b4553012 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -539,7 +539,11 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece
mXmppConnectionService.updateConversationUi();
}
- if (mXmppConnectionService.confirmMessages() && remoteMsgId != null && !isForwarded && !isTypeGroupChat) {
+ if (mXmppConnectionService.confirmMessages()
+ && message.trusted()
+ && remoteMsgId != null
+ && !isForwarded
+ && !isTypeGroupChat) {
sendMessageReceipts(account, packet);
}