aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2017-12-02 22:13:59 +0100
committerDaniel Gultsch <daniel@gultsch.de>2017-12-02 22:13:59 +0100
commit4b5db2fb45dbe65b9f660355d732cd04104fad8b (patch)
tree8f5c710082ee90320c9300dc373f2e07d3759ec2
parentffb3eeb9139f77a3d4465e207dac0fee51773cdd (diff)
read marker from mam. only trust true counterpart when mam:2 is being used
-rw-r--r--src/main/java/eu/siacs/conversations/parser/MessageParser.java2
1 files changed, 1 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 5458ecb..66ec661 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() + "'");