From 4b5db2fb45dbe65b9f660355d732cd04104fad8b Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 2 Dec 2017 22:13:59 +0100 Subject: [PATCH] read marker from mam. only trust true counterpart when mam:2 is being used --- src/main/java/eu/siacs/conversations/parser/MessageParser.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java index 5458ecbfe..66ec66124 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -750,7 +750,7 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece } } else { final Jid fallback = conversation.getMucOptions().getTrueCounterpart(counterpart); - Jid trueJid = getTrueCounterpart(query != null ? mucUserElement : null, fallback); + Jid trueJid = getTrueCounterpart((query != null && query.safeToExtractTrueCounterpart()) ? mucUserElement : null, fallback); ReadByMarker readByMarker = ReadByMarker.from(counterpart, trueJid); if (message.addReadByMarker(readByMarker)) { Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": added read by (" + readByMarker.getRealJid() + ") to message '" + message.getBody() + "'");