Removed stupid message correction

1 files changed, 0 insertions, 35 deletions

diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
index 1ad28c40..6e07396e 100644
--- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java
+++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java
@@ -394,41 +394,6 @@ public class MessageParser extends AbstractParser implements
 				updateLastseen(timestamp, account, packet.getFrom(), true);
 			}
 
-			if (replacementId != null && ConversationsPlusPreferences.allowMessageCorrection()) {
-				Message replacedMessage = conversation.findMessageWithRemoteIdAndCounterpart(replacementId,
-						counterpart,
-						message.getStatus() == Message.STATUS_RECEIVED,
-						message.isCarbon());
-				if (replacedMessage != null) {
-					final boolean fingerprintsMatch = replacedMessage.getAxolotlFingerprint() == null
-							|| replacedMessage.getAxolotlFingerprint().equals(message.getAxolotlFingerprint());
-					final boolean trueCountersMatch = replacedMessage.getTrueCounterpart() != null
-							&& replacedMessage.getTrueCounterpart().equals(message.getTrueCounterpart());
-					if (fingerprintsMatch && (trueCountersMatch || conversation.getMode() == Conversation.MODE_SINGLE)) {
-						Log.d(Config.LOGTAG, "replaced message '" + replacedMessage.getBody() + "' with '" + message.getBody() + "'");
-						final String uuid = replacedMessage.getUuid();
-						replacedMessage.setUuid(UUID.randomUUID().toString());
-						replacedMessage.setBody(message.getBody());
-						replacedMessage.setEdited(replacedMessage.getRemoteMsgId());
-						replacedMessage.setRemoteMsgId(remoteMsgId);
-						replacedMessage.setEncryption(message.getEncryption());
-						if (replacedMessage.getStatus() == Message.STATUS_RECEIVED) {
-							replacedMessage.markUnread();
-						}
-						mXmppConnectionService.updateMessage(replacedMessage, uuid);
-						if (mXmppConnectionService.confirmMessages() && remoteMsgId != null && !isForwarded && !isTypeGroupChat) {
-							sendMessageReceipts(account, packet);
-						}
-						if (replacedMessage.getEncryption() == Message.ENCRYPTION_PGP) {
-							conversation.getAccount().getPgpDecryptionService().add(replacedMessage);
-						}
-						return;
-					} else {
-						Log.d(Config.LOGTAG,account.getJid().toBareJid()+": received message correction but verification didn't check out");
-					}
-				}
-			}
-
 			boolean checkForDuplicates = query != null
 					|| (isTypeGroupChat && packet.hasChild("delay","urn:xmpp:delay"))
 					|| message.getType() == Message.TYPE_PRIVATE;