diff options
| author | Christian Schneppe <christian@pix-art.de> | 2017-12-10 20:55:28 +0100 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2017-12-10 20:55:28 +0100 |
| commit | a67ae91d9fefd829408cc62e25514fa38c8762e6 (patch) | |
| tree | 58c5e952f3a37685658d21003a0214cfc9f69af4 /src/main/java/de/pixart/messenger/parser | |
| parent | 8e8a1f04800fce4618506ff2c47157f94bd6c489 (diff) | |
MAM: assume true counterpart is safe to extract when using mam:2
Diffstat (limited to 'src/main/java/de/pixart/messenger/parser')
| -rw-r--r-- | src/main/java/de/pixart/messenger/parser/MessageParser.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java index 9d64110a8..64bb0b2d5 100644 --- a/src/main/java/de/pixart/messenger/parser/MessageParser.java +++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java @@ -502,8 +502,8 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece Jid trueCounterpart; if (message.getEncryption() == Message.ENCRYPTION_AXOLOTL) { trueCounterpart = message.getTrueCounterpart(); - } else if (Config.PARSE_REAL_JID_FROM_MUC_MAM) { - trueCounterpart = getTrueCounterpart(query != null ? mucUserElement : null, fallback); + } else if (query != null && query.safeToExtractTrueCounterpart()) { + trueCounterpart = getTrueCounterpart(mucUserElement, fallback); } else { trueCounterpart = fallback; } |