diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-10-07 10:05:08 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-10-07 10:05:08 +0200 |
| commit | 1f7f82da7b4e98e76588721d16ebf2b3e42e9084 (patch) | |
| tree | c2196a384e58ef9c33087cf757a1a39ec2d0bbc7 /src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |
| parent | 26e33de79aad9bd688e1fdfdf0108a962cdc3244 (diff) | |
respond to chat marker request only when mutual presence subscription exists
Diffstat (limited to 'src/main/java/eu/siacs/conversations/services/XmppConnectionService.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | 5 |
1 files changed, 4 insertions, 1 deletions
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(); |