Merge tag '1.10.0' into trz/merge_1.10.0

Conflicts:
	README.md
	build.gradle
	src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java
	src/main/java/eu/siacs/conversations/parser/MessageParser.java
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
	src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
	src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
	src/main/res/layout/activity_edit_account.xml
	src/main/res/values-cs/strings.xml
	src/main/res/values-de/strings.xml
	src/main/res/values-es/strings.xml
	src/main/res/values-eu/strings.xml
	src/main/res/values-gl/strings.xml
	src/main/res/values-it/strings.xml
	src/main/res/values-ja/strings.xml
	src/main/res/values-nb-rNO/strings.xml
	src/main/res/values-nl/strings.xml
	src/main/res/values-pl/strings.xml
	src/main/res/values-sr/strings.xml
	src/main/res/values-zh-rCN/strings.xml
	src/main/res/values-zh-rTW/strings.xml
	src/main/res/values/strings.xml

1 files changed, 34 insertions, 4 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index ba1244d1..4eea56b8 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -84,6 +84,7 @@ public class Conversation extends AbstractEntity implements Blockable {
 	private ChatState mIncomingChatState = Config.DEFAULT_CHATSTATE;
 	private String mLastReceivedOtrMessageId = null;
 	private String mFirstMamReference = null;
+	private Message correctingMessage;
 
 	public boolean hasMessagesLeftOnServer() {
 		return messagesLeftOnServer;
@@ -228,6 +229,24 @@ public class Conversation extends AbstractEntity implements Blockable {
 		return null;
 	}
 
+	public Message findMessageWithRemoteIdAndCounterpart(String id, Jid counterpart, boolean received, boolean carbon) {
+		synchronized (this.messages) {
+			for(int i = this.messages.size() - 1; i >= 0; --i) {
+				Message message = messages.get(i);
+				if (counterpart.equals(message.getCounterpart())
+						&& ((message.getStatus() == Message.STATUS_RECEIVED) == received)
+						&& (carbon == message.isCarbon() || received) ) {
+					if (id.equals(message.getRemoteMsgId())) {
+						return message;
+					} else {
+						return null;
+					}
+				}
+			}
+		}
+		return null;
+	}
+
 	public Message findSentMessageWithUuid(String id) {
 		synchronized (this.messages) {
 			for (Message message : this.messages) {
@@ -296,6 +315,14 @@ public class Conversation extends AbstractEntity implements Blockable {
 		return getLongAttribute("last_clear_history", 0);
 	}
 
+	public void setCorrectingMessage(Message correctingMessage) {
+		this.correctingMessage = correctingMessage;
+	}
+
+	public Message getCorrectingMessage() {
+		return this.correctingMessage;
+	}
+
 	public interface OnMessageFound {
 		void onMessageFound(final Message message);
 	}
@@ -499,15 +526,18 @@ public class Conversation extends AbstractEntity implements Blockable {
 		return mSmp;
 	}
 
-	public void startOtrIfNeeded() {
-		if (this.otrSession != null
-				&& this.otrSession.getSessionStatus() != SessionStatus.ENCRYPTED) {
+	public boolean startOtrIfNeeded() {
+		if (this.otrSession != null && this.otrSession.getSessionStatus() != SessionStatus.ENCRYPTED) {
 			try {
 				this.otrSession.startSession();
+				return true;
 			} catch (OtrException e) {
 				this.resetOtrSession();
+				return false;
 			}
-				}
+		} else {
+			return true;
+		}
 	}
 
 	public boolean endOtrIfNeeded() {