Removed stupid message correction

1 files changed, 9 insertions, 53 deletions

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;