XmppConnectionService.markMessage moved to MessageUtil

XmppConnectionService.attachLocationToConversation moved to ConversationUtil

1 files changed, 4 insertions, 3 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
index a89adb23..a8e5929b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
@@ -3,6 +3,7 @@ package de.thedevstack.conversationsplus.parser;
 import android.util.Log;
 import android.util.Pair;
 
+import de.thedevstack.conversationsplus.utils.MessageUtil;
 import de.thedevstack.conversationsplus.xmpp.httpuploadim.HttpUploadHint;
 import de.tzur.conversations.Settings;
 
@@ -343,12 +344,12 @@ public class MessageParser extends AbstractParser implements
 				if (counterpart.getResourcepart().equals(conversation.getMucOptions().getActualNick())) {
 					status = Message.STATUS_SEND_RECEIVED;
 					isCarbon = true; //not really carbon but received from another resource
-					if (mXmppConnectionService.markMessage(conversation, remoteMsgId, status)) {
+					if (MessageUtil.markMessage(conversation, remoteMsgId, status)) {
 						return;
 					} else if (remoteMsgId == null || Config.IGNORE_ID_REWRITE_IN_MUC) {
 						Message message = conversation.findSentMessageWithBody(packet.getBody());
 						if (message != null) {
-							mXmppConnectionService.markMessage(message, status);
+							MessageUtil.markMessage(message, status);
 							return;
 						}
 					}
@@ -535,7 +536,7 @@ public class MessageParser extends AbstractParser implements
 				while (message != null
 						&& message.getStatus() == Message.STATUS_SEND_RECEIVED
 						&& message.getTimeSent() < displayedMessage.getTimeSent()) {
-					mXmppConnectionService.markMessage(message, Message.STATUS_SEND_DISPLAYED);
+					MessageUtil.markMessage(message, Message.STATUS_SEND_DISPLAYED);
 					message = message.prev();
 				}
 			}