From 1f7f82da7b4e98e76588721d16ebf2b3e42e9084 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 7 Oct 2016 10:05:08 +0200
Subject: respond to chat marker request only when mutual presence subscription
 exists

---
 .../java/eu/siacs/conversations/services/XmppConnectionService.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')

diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index fc51b81c..e8b13dde 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -3115,7 +3115,10 @@ public class XmppConnectionService extends Service {
 		if (this.markRead(conversation)) {
 			updateConversationUi();
 		}
-		if (confirmMessages() && markable != null && markable.getRemoteMsgId() != null) {
+		if (confirmMessages()
+				&& markable != null
+				&& markable.trusted()
+				&& markable.getRemoteMsgId() != null) {
 			Log.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid() + ": sending read marker to " + markable.getCounterpart().toString());
 			Account account = conversation.getAccount();
 			final Jid to = markable.getCounterpart();
-- 
cgit v1.2.3