diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-02-16 09:57:59 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-02-16 09:57:59 +0100 |
| commit | a9b957e8a2b9cb7729ed0d2cc8b5efa1bee50c79 (patch) | |
| tree | baffe59d760a36e3b1f23fc1ff8230d658fa77b5 /src/main/java/eu/siacs/conversations/parser/MessageParser.java | |
| parent | 0ca4a33bfb76d63a3c2d4447643a5bd90ac5315f (diff) | |
added setting to opt-out of message correction. renamed preferences and options to settings
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser/MessageParser.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/parser/MessageParser.java | 2 |
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 18edfdeb..620039a1 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -393,7 +393,7 @@ public class MessageParser extends AbstractParser implements updateLastseen(timestamp, account, packet.getFrom(), true); } - if (replacementId != null) { + if (replacementId != null && mXmppConnectionService.allowMessageCorrection()) { Message replacedMessage = conversation.findMessageWithRemoteIdAndCounterpart(replacementId, counterpart); if (replacedMessage != null) { final boolean fingerprintsMatch = replacedMessage.getAxolotlFingerprint() == null |