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

4 files changed, 100 insertions, 21 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() {
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index f800def1..3f923c41 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -51,6 +51,7 @@ public class Message extends AbstractEntity {
 	public static final String STATUS = "status";
 	public static final String TYPE = "type";
 	public static final String CARBON = "carbon";
+	public static final String EDITED = "edited";
 	public static final String REMOTE_MSG_ID = "remoteMsgId";
 	public static final String SERVER_MSG_ID = "serverMsgId";
 	public static final String RELATIVE_FILE_PATH = "relativeFilePath";
@@ -70,6 +71,7 @@ public class Message extends AbstractEntity {
 	protected int status;
 	protected int type;
 	protected boolean carbon = false;
+	protected String edited = null;
 	protected String relativeFilePath;
 	protected boolean read = true;
 	protected String remoteMsgId = null;
@@ -103,7 +105,8 @@ public class Message extends AbstractEntity {
 				null,
 				null,
 				null,
-				true);
+				true,
+				null);
 		this.conversation = conversation;
 	}
 
@@ -111,7 +114,8 @@ public class Message extends AbstractEntity {
 					final Jid trueCounterpart, final String body, final long timeSent,
 					final int encryption, final int status, final int type, final boolean carbon,
 					final String remoteMsgId, final String relativeFilePath,
-					final String serverMsgId, final String fingerprint, final boolean read) {
+					final String serverMsgId, final String fingerprint, final boolean read,
+					final String edited) {
 		this.uuid = uuid;
 		this.conversationUuid = conversationUUid;
 		this.counterpart = counterpart;
@@ -127,6 +131,7 @@ public class Message extends AbstractEntity {
 		this.serverMsgId = serverMsgId;
 		this.axolotlFingerprint = fingerprint;
 		this.read = read;
+		this.edited = edited;
 	}
 
 	public static Message fromCursor(Cursor cursor) {
@@ -161,12 +166,13 @@ public class Message extends AbstractEntity {
 				cursor.getInt(cursor.getColumnIndex(ENCRYPTION)),
 				cursor.getInt(cursor.getColumnIndex(STATUS)),
 				cursor.getInt(cursor.getColumnIndex(TYPE)),
-				cursor.getInt(cursor.getColumnIndex(CARBON))>0,
+				cursor.getInt(cursor.getColumnIndex(CARBON)) > 0,
 				cursor.getString(cursor.getColumnIndex(REMOTE_MSG_ID)),
 				cursor.getString(cursor.getColumnIndex(RELATIVE_FILE_PATH)),
 				cursor.getString(cursor.getColumnIndex(SERVER_MSG_ID)),
 				cursor.getString(cursor.getColumnIndex(FINGERPRINT)),
-				cursor.getInt(cursor.getColumnIndex(READ)) > 0);
+				cursor.getInt(cursor.getColumnIndex(READ)) > 0,
+				cursor.getString(cursor.getColumnIndex(EDITED)));
 	}
 
 	public static Message createStatusMessage(Conversation conversation, String body) {
@@ -210,7 +216,8 @@ public class Message extends AbstractEntity {
 		values.put(RELATIVE_FILE_PATH, relativeFilePath);
 		values.put(SERVER_MSG_ID, serverMsgId);
 		values.put(FINGERPRINT, axolotlFingerprint);
-		values.put(READ,read);
+		values.put(READ,read ? 1 : 0);
+		values.put(EDITED, edited);
 		return values;
 	}
 
@@ -339,10 +346,22 @@ public class Message extends AbstractEntity {
 		this.carbon = carbon;
 	}
 
+	public void setEdited(String edited) {
+		this.edited = edited;
+	}
+
+	public boolean edited() {
+		return this.edited != null;
+	}
+
 	public void setTrueCounterpart(Jid trueCounterpart) {
 		this.trueCounterpart = trueCounterpart;
 	}
 
+	public Jid getTrueCounterpart() {
+		return this.trueCounterpart;
+	}
+
 	public Transferable getTransferable() {
 		return this.transferable;
 	}
@@ -408,6 +427,21 @@ public class Message extends AbstractEntity {
 		}
 	}
 
+	public boolean isLastCorrectableMessage() {
+		Message next = next();
+		while(next != null) {
+			if (next.isCorrectable()) {
+				return false;
+			}
+			next = next.next();
+		}
+		return isCorrectable();
+	}
+
+	private boolean isCorrectable() {
+		return getStatus() != STATUS_RECEIVED && !isCarbon();
+	}
+
 	public boolean mergeable(final Message message) {
 		return message != null &&
 				(message.getType() == Message.TYPE_TEXT &&
@@ -420,6 +454,7 @@ public class Message extends AbstractEntity {
 						this.getEncryption() == message.getEncryption() &&
 						this.getCounterpart() != null &&
 						this.getCounterpart().equals(message.getCounterpart()) &&
+						this.edited() == message.edited() &&
 						(message.getTimeSent() - this.getTimeSent()) <= (Config.MESSAGE_MERGE_WINDOW * 1000) &&
 						!GeoHelper.isGeoUri(message.getBody()) &&
 						!GeoHelper.isGeoUri(this.getBody()) &&
@@ -507,6 +542,14 @@ public class Message extends AbstractEntity {
 		}
 	}
 
+	public void setUuid(String uuid) {
+		this.uuid = uuid;
+	}
+
+	public String getEditedId() {
+		return edited;
+	}
+
 	public enum Decision {
 		MUST,
 		SHOULD,
diff --git a/src/main/java/eu/siacs/conversations/entities/MucOptions.java b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
index 7f4ded11..be9d790d 100644
--- a/src/main/java/eu/siacs/conversations/entities/MucOptions.java
+++ b/src/main/java/eu/siacs/conversations/entities/MucOptions.java
@@ -282,7 +282,9 @@ public class MucOptions {
 	}
 
 	public boolean participating() {
-		return !online() || self.getRole().ranks(Role.PARTICIPANT);
+		return !online()
+				|| self.getRole().ranks(Role.PARTICIPANT)
+				|| hasFeature("muc_unmoderated");
 	}
 
 	public boolean membersOnly() {
diff --git a/src/main/java/eu/siacs/conversations/entities/Presence.java b/src/main/java/eu/siacs/conversations/entities/Presence.java
index 69cde832..442f1bca 100644
--- a/src/main/java/eu/siacs/conversations/entities/Presence.java
+++ b/src/main/java/eu/siacs/conversations/entities/Presence.java
@@ -1,6 +1,7 @@
 package eu.siacs.conversations.entities;
 
 import java.lang.Comparable;
+import java.util.Locale;
 
 import eu.siacs.conversations.xml.Element;
 
@@ -32,21 +33,24 @@ public class Presence implements Comparable {
 		this.hash = hash;
 	}
 
-	public static Presence parse(Element show, Element caps) {
+	public static Presence parse(String show, Element caps) {
 		final String hash = caps == null ? null : caps.getAttribute("hash");
 		final String ver = caps == null ? null : caps.getAttribute("ver");
-		if ((show == null) || (show.getContent() == null)) {
+		if (show == null) {
 			return new Presence(Status.ONLINE, ver, hash);
-		} else if (show.getContent().equals("away")) {
-			return new Presence(Status.AWAY, ver, hash);
-		} else if (show.getContent().equals("xa")) {
-			return new Presence(Status.XA, ver, hash);
-		} else if (show.getContent().equals("chat")) {
-			return new Presence(Status.CHAT, ver, hash);
-		} else if (show.getContent().equals("dnd")) {
-			return new Presence(Status.DND, ver, hash);
 		} else {
-			return new Presence(Status.OFFLINE, ver, hash);
+			switch (show.toLowerCase(Locale.US)) {
+				case "away":
+					return new Presence(Status.AWAY, ver, hash);
+				case "xa":
+					return new Presence(Status.XA, ver, hash);
+				case "dnd":
+					return new Presence(Status.DND, ver, hash);
+				case "chat":
+					return new Presence(Status.CHAT, ver, hash);
+				default:
+					return new Presence(Status.ONLINE, ver, hash);
+			}
 		}
 	}