Removed stupid message correction

6 files changed, 10 insertions, 110 deletions

diff --git a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
index f50ec1b4..256c48de 100644
--- a/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
@@ -41,9 +41,6 @@ public abstract class AbstractGenerator {
 			"urn:xmpp:chat-markers:0",
 			"urn:xmpp:receipts"
 	};
-	private final String[] MESSAGE_CORRECTION_FEATURES = {
-			"urn:xmpp:message-correct:0"
-	};
 	protected final String IDENTITY_TYPE = "phone";
 
 	private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
@@ -76,9 +73,6 @@ public abstract class AbstractGenerator {
 		if (Settings.CONFIRM_MESSAGE_RECEIVED) {
 			features.addAll(Arrays.asList(MESSAGE_CONFIRMATION_FEATURES));
 		}
-		if (ConversationsPlusPreferences.allowMessageCorrection()) {
-			features.addAll(Arrays.asList(MESSAGE_CORRECTION_FEATURES));
-		}
 		Collections.sort(features);
 		return features;
 	}
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;
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index 9b49ea4d..53d34b95 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -219,14 +219,8 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 						activity.attachFile(ConversationActivity.ATTACHMENT_CHOICE_CHOOSE_IMAGE);
 						break;
 					case CANCEL:
-						if (conversation != null) {
-							if (conversation.getCorrectingMessage() != null) {
-								conversation.setCorrectingMessage(null);
-								mEditMessage.getEditableText().clear();
-							}
-							if (conversation.getMode() == Conversation.MODE_MULTI) {
-								conversation.setNextCounterpart(null);
-							}
+						if (conversation != null && conversation.getMode() == Conversation.MODE_MULTI) {
+							conversation.setNextCounterpart(null);
 							updateChatMsgHint();
 							updateSendButton();
 						}
@@ -261,21 +255,12 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		if (body.length() == 0 || this.conversation == null) {
 			return;
 		}
-		final Message message;
-		if (conversation.getCorrectingMessage() == null) {
-			message = new Message(conversation, body, conversation.getNextEncryption());
-			if (conversation.getMode() == Conversation.MODE_MULTI) {
-				if (conversation.getNextCounterpart() != null) {
-					message.setCounterpart(conversation.getNextCounterpart());
-					message.setType(Message.TYPE_PRIVATE);
-				}
+		Message message = new Message(conversation, body, conversation.getNextEncryption());
+		if (conversation.getMode() == Conversation.MODE_MULTI) {
+			if (conversation.getNextCounterpart() != null) {
+				message.setCounterpart(conversation.getNextCounterpart());
+				message.setType(Message.TYPE_PRIVATE);
 			}
-		} else {
-			message = conversation.getCorrectingMessage();
-			message.setBody(body);
-			message.setEdited(message.getUuid());
-			message.setUuid(UUID.randomUUID().toString());
-			conversation.setCorrectingMessage(null);
 		}
 		switch (conversation.getNextEncryption()) {
 			case Message.ENCRYPTION_OTR:
@@ -296,9 +281,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 
 	public void updateChatMsgHint() {
 		final boolean multi = conversation.getMode() == Conversation.MODE_MULTI;
-		if (conversation.getCorrectingMessage() != null) {
-			this.mEditMessage.setHint(R.string.send_corrected_message);
-		} else if (multi && conversation.getNextCounterpart() != null) {
+		if (multi && conversation.getNextCounterpart() != null) {
 			this.mEditMessage.setHint(getString(
 					R.string.send_private_message_to,
 					conversation.getNextCounterpart().getResourcepart()));
@@ -554,7 +537,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 			activity.getMenuInflater().inflate(R.menu.message_context, menu);
 			menu.setHeaderTitle(R.string.message_options);
 			MenuItem copyText = menu.findItem(R.id.copy_text);
-			MenuItem correctMessage = menu.findItem(R.id.correct_message);
 			MenuItem shareWith = menu.findItem(R.id.share_with);
 			MenuItem sendAgain = menu.findItem(R.id.send_again);
 			MenuItem copyUrl = menu.findItem(R.id.copy_url);
@@ -566,10 +548,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 					&& m.treatAsDownloadable() != Message.Decision.MUST) {
 				copyText.setVisible(true);
 			}
-			if (relevantForCorrection.getType() == Message.TYPE_TEXT
-					&& relevantForCorrection.isLastCorrectableMessage()) {
-				correctMessage.setVisible(true);
-			}
 			if ((m.getType() != Message.TYPE_TEXT
 					&& m.getType() != Message.TYPE_PRIVATE
 					&& m.getTransferable() == null)
@@ -606,9 +584,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 			case R.id.copy_text:
 				copyText(selectedMessage);
 				return true;
-			case R.id.correct_message:
-				correctMessage(selectedMessage);
-				return true;
 			case R.id.send_again:
 				resendMessage(selectedMessage);
 				return true;
@@ -710,16 +685,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		updateSendButton();
 	}
 
-	private void correctMessage(Message message) {
-		while(message.mergeable(message.next())) {
-			message = message.next();
-		}
-		this.conversation.setCorrectingMessage(message);
-		this.mEditMessage.getEditableText().clear();
-		this.mEditMessage.getEditableText().append(message.getBody());
-
-	}
-
 	protected void highlightInConference(String nick) {
 		String oldString = mEditMessage.getText().toString();
 		if (oldString.isEmpty() || mEditMessage.getSelectionStart() == 0) {
@@ -1026,9 +991,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		final String text = this.mEditMessage == null ? "" : this.mEditMessage.getText().toString();
 		final boolean empty = text.length() == 0;
 		final boolean conference = c.getMode() == Conversation.MODE_MULTI;
-		if (c.getCorrectingMessage() != null && (empty || text.equals(c.getCorrectingMessage().getBody()))) {
-			action = SendButtonAction.CANCEL;
-		} else if (conference && !c.getAccount().httpUploadAvailable()) {
+		if (conference && !c.getAccount().httpUploadAvailable()) {
 			if (empty && c.getNextCounterpart() != null) {
 				action = SendButtonAction.CANCEL;
 			} else {
@@ -1299,13 +1262,6 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		updateSendButton();
 	}
 
-	@Override
-	public void onTextChanged() {
-		if (conversation != null && conversation.getCorrectingMessage() != null) {
-			updateSendButton();
-		}
-	}
-
 	private int completionIndex = 0;
 	private int lastCompletionLength = 0;
 	private String incomplete;
diff --git a/src/main/java/eu/siacs/conversations/ui/EditMessage.java b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
index 8cc59cde..06868a98 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditMessage.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditMessage.java
@@ -69,7 +69,6 @@ public class EditMessage extends EmojiconEditText {
 				this.isUserTyping = false;
 				this.keyboardListener.onTextDeleted();
 			}
-			this.keyboardListener.onTextChanged();
 		}
 	}
 
@@ -85,7 +84,6 @@ public class EditMessage extends EmojiconEditText {
 		void onTypingStarted();
 		void onTypingStopped();
 		void onTextDeleted();
-		void onTextChanged();
 		boolean onTabPressed(boolean repeated);
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 49deab38..83ab83e7 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -165,8 +165,7 @@ public class SettingsActivity extends XmppActivity implements
 			xmppConnectionService.toggleForegroundService();
 		} else if (name.equals("confirm_messages")
 				|| name.equals("xa_on_silent_mode")
-				|| name.equals("away_when_screen_off")
-				|| name.equals("allow_message_correction")) {
+				|| name.equals("away_when_screen_off")) {
 			if (xmppConnectionServiceBound) {
 				if (name.equals("away_when_screen_off")) {
 					xmppConnectionService.toggleScreenEventReceiver();
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 62caaa2d..444c217d 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -125,15 +125,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 			viewHolder.indicatorReceived.setVisibility(View.GONE);
 		}
 
-		if (viewHolder.edit_indicator != null) {
-			if (message.edited()) {
-				viewHolder.edit_indicator.setVisibility(View.VISIBLE);
-				viewHolder.edit_indicator.setImageResource(darkBackground ? R.drawable.ic_mode_edit_white_18dp : R.drawable.ic_mode_edit_black_18dp);
-				viewHolder.edit_indicator.setAlpha(darkBackground ? 0.7f : 0.57f);
-			} else {
-				viewHolder.edit_indicator.setVisibility(View.GONE);
-			}
-		}
 		boolean multiReceived = message.getConversation().getMode() == Conversation.MODE_MULTI
 			&& message.getMergedStatus() <= Message.STATUS_RECEIVED;
 		if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE || message.getTransferable() != null) {
@@ -463,7 +454,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 						.findViewById(R.id.download_button);
 					viewHolder.indicator = (ImageView) view
 						.findViewById(R.id.security_indicator);
-					viewHolder.edit_indicator = (ImageView) view.findViewById(R.id.edit_indicator);
 					viewHolder.image = (ImageView) view
 						.findViewById(R.id.message_image);
 					viewHolder.messageBody = (TextView) view
@@ -484,7 +474,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 						.findViewById(R.id.download_button);
 					viewHolder.indicator = (ImageView) view
 						.findViewById(R.id.security_indicator);
-					viewHolder.edit_indicator = (ImageView) view.findViewById(R.id.edit_indicator);
 					viewHolder.image = (ImageView) view
 						.findViewById(R.id.message_image);
 					viewHolder.messageBody = (TextView) view
@@ -675,7 +664,6 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 		protected ImageView contact_picture;
 		protected TextView status_message;
 		protected TextView encryption;
-		public ImageView edit_indicator;
 	}
 
 	class BitmapWorkerTask extends AsyncTask<Message, Void, Bitmap> {