From 99935dd630b59d6cff05714c888b01e4c88c6351 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Sat, 12 Jul 2014 03:44:23 +0200
Subject: moved most of the message/presence generation into seperate classes

---
 src/eu/siacs/conversations/entities/Conversation.java | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

(limited to 'src/eu/siacs/conversations/entities/Conversation.java')

diff --git a/src/eu/siacs/conversations/entities/Conversation.java b/src/eu/siacs/conversations/entities/Conversation.java
index c207a5c9..23ab382f 100644
--- a/src/eu/siacs/conversations/entities/Conversation.java
+++ b/src/eu/siacs/conversations/entities/Conversation.java
@@ -4,8 +4,6 @@ import java.security.interfaces.DSAPublicKey;
 import java.util.ArrayList;
 import java.util.List;
 
-import eu.siacs.conversations.services.XmppConnectionService;
-
 import net.java.otr4j.OtrException;
 import net.java.otr4j.crypto.OtrCryptoEngineImpl;
 import net.java.otr4j.crypto.OtrCryptoException;
@@ -117,14 +115,11 @@ public class Conversation extends AbstractEntity {
 			this.messages.get(i).markRead();
 		}
 	}
-
-	public void markRead(XmppConnectionService service) {
-		markRead();
-		if (service.confirmMessages() && this.latestMarkableMessageId != null) {
-			service.sendConfirmMessage(getAccount(), getContactJid(),
-					this.latestMarkableMessageId);
-			this.latestMarkableMessageId = null;
-		}
+	
+	public String popLatestMarkableMessageId() {
+		String id = this.latestMarkableMessageId;
+		this.latestMarkableMessageId = null;
+		return id;
 	}
 
 	public Message getLatestMessage() {
-- 
cgit v1.2.3