Merge remote-tracking branch 'siacs/master' into development

1 files changed, 29 insertions, 1 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index d2f3e69ea..1e18f6967 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -82,6 +82,7 @@ public class Conversation extends AbstractEntity implements Blockable {
 	private ChatState mOutgoingChatState = Config.DEFAULT_CHATSTATE;
 	private ChatState mIncomingChatState = Config.DEFAULT_CHATSTATE;
 	private String mLastReceivedOtrMessageId = null;
+	private String mFirstMamReference = null;
 
 	public boolean hasMessagesLeftOnServer() {
 		return messagesLeftOnServer;
@@ -278,6 +279,22 @@ public class Conversation extends AbstractEntity implements Blockable {
 		}
 	}
 
+	public void setFirstMamReference(String reference) {
+		this.mFirstMamReference = reference;
+	}
+
+	public String getFirstMamReference() {
+		return this.mFirstMamReference;
+	}
+
+	public void setLastClearHistory(long time) {
+		setAttribute("last_clear_history",String.valueOf(time));
+	}
+
+	public long getLastClearHistory() {
+		return getLongAttribute("last_clear_history", 0);
+	}
+
 	public interface OnMessageFound {
 		void onMessageFound(final Message message);
 	}
@@ -725,6 +742,10 @@ public class Conversation extends AbstractEntity implements Blockable {
 	}
 
 	public long getLastMessageTransmitted() {
+		long last_clear = getLastClearHistory();
+		if (last_clear != 0) {
+			return last_clear;
+		}
 		synchronized (this.messages) {
 			for(int i = this.messages.size() - 1; i >= 0; --i) {
 				Message message = this.messages.get(i);
@@ -745,7 +766,7 @@ public class Conversation extends AbstractEntity implements Blockable {
 	}
 
 	public boolean alwaysNotify() {
-		return mode == MODE_SINGLE || getBooleanAttribute(ATTRIBUTE_ALWAYS_NOTIFY,Config.ALWAYS_NOTIFY_BY_DEFAULT || isPnNA());
+		return mode == MODE_SINGLE || getBooleanAttribute(ATTRIBUTE_ALWAYS_NOTIFY, Config.ALWAYS_NOTIFY_BY_DEFAULT || isPnNA());
 	}
 
 	public boolean setAttribute(String key, String value) {
@@ -807,6 +828,13 @@ public class Conversation extends AbstractEntity implements Blockable {
 		}
 	}
 
+	public void prepend(Message message) {
+		message.setConversation(this);
+		synchronized (this.messages) {
+			this.messages.add(0,message);
+		}
+	}
+
 	public void addAll(int index, List<Message> messages) {
 		synchronized (this.messages) {
 			this.messages.addAll(index, messages);