From 32b1ab2b3b54c53e61c61bc779ae01bc9b62c776 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sun, 8 Dec 2019 15:37:29 +0100 Subject: only show message deleted if LMC is activated --- src/main/java/de/pixart/messenger/parser/MessageParser.java | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/main/java/de/pixart/messenger/parser/MessageParser.java') diff --git a/src/main/java/de/pixart/messenger/parser/MessageParser.java b/src/main/java/de/pixart/messenger/parser/MessageParser.java index 020866fa1..8dadbd364 100644 --- a/src/main/java/de/pixart/messenger/parser/MessageParser.java +++ b/src/main/java/de/pixart/messenger/parser/MessageParser.java @@ -53,6 +53,8 @@ import de.pixart.messenger.xmpp.pep.Avatar; import de.pixart.messenger.xmpp.stanzas.MessagePacket; import rocks.xmpp.addr.Jid; +import static de.pixart.messenger.entities.Message.DELETED_MESSAGE_BODY; + public class MessageParser extends AbstractParser implements OnMessagePacketReceived { private static final List CLIENTS_SENDING_HTML_IN_OTR = Arrays.asList("Pidgin", "Adium", "Trillian"); @@ -741,6 +743,9 @@ public class MessageParser extends AbstractParser implements OnMessagePacketRece Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": received message correction but verification didn't check out"); } } + } else if (replacementId != null && !mXmppConnectionService.allowMessageCorrection() && message.getBody().equals(DELETED_MESSAGE_BODY)) { + Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": received deleted message but LMC is deactivated"); + return; } long deletionDate = mXmppConnectionService.getAutomaticMessageDeletionDate(); -- cgit v1.2.3