1 files changed, 11 insertions, 19 deletions

diff --git a/src/main/java/eu/siacs/conversations/entities/Conversation.java b/src/main/java/eu/siacs/conversations/entities/Conversation.java
index b1d597df..ab0e4966 100644
--- a/src/main/java/eu/siacs/conversations/entities/Conversation.java
+++ b/src/main/java/eu/siacs/conversations/entities/Conversation.java
@@ -21,6 +21,8 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.crypto.axolotl.AxolotlService;
 import eu.siacs.conversations.xmpp.chatstate.ChatState;
@@ -259,16 +261,12 @@ public class Conversation extends AbstractEntity implements Blockable {
 		return null;
 	}
 
+    // TODO Check if this is really necessary
 	public void populateWithMessages(final List<Message> messages) {
 		synchronized (this.messages) {
 			messages.clear();
 			messages.addAll(this.messages);
 		}
-		for(Iterator<Message> iterator = messages.iterator(); iterator.hasNext();) {
-			if (iterator.next().wasMergedIntoPrevious()) {
-				iterator.remove();
-			}
-		}
 	}
 
 	@Override
@@ -308,14 +306,6 @@ public class Conversation extends AbstractEntity implements Blockable {
 		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 List<Jid> getAcceptedCryptoTargets() {
 		if (mode == MODE_SINGLE) {
 			return Arrays.asList(getJid().toBareJid());
@@ -773,7 +763,7 @@ public class Conversation extends AbstractEntity implements Blockable {
 					if (message.hasFileOnRemoteHost()) {
 						otherBody = message.getFileParams().url.toString();
 					} else {
-						otherBody = message.body;
+						otherBody = message.getBody();
 					}
 					if (otherBody != null && otherBody.equals(body)) {
 						return message;
@@ -785,10 +775,6 @@ 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);
@@ -945,14 +931,20 @@ public class Conversation extends AbstractEntity implements Blockable {
 	}
 
 	public int unreadCount() {
+		if (getLongAttribute(Conversation.ATTRIBUTE_MUTED_TILL,0) == Long.MAX_VALUE) {
+			return 0;
+		}
 		synchronized (this.messages) {
 			int count = 0;
 			for(int i = this.messages.size() - 1; i >= 0; --i) {
-				if (this.messages.get(i).isRead()) {
+				Message message = this.messages.get(i);
+				if (message.isRead()) {
 					return count;
 				}
+				if (alwaysNotify() || MessageUtil.wasHighlightedOrPrivate(message)) {
 					++count;
 				}
+			}
 			return count;
 		}
 	}