From 132b27adeef3ab4d305facda7dd035015b00766f Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Sat, 5 May 2018 20:28:04 +0200
Subject: introduces new message state model

---
 .../generator/MessageGenerator.java                | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/generator/MessageGenerator.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/generator/MessageGenerator.java b/src/main/java/de/thedevstack/conversationsplus/generator/MessageGenerator.java
index 2e580f09..13494baf 100644
--- a/src/main/java/de/thedevstack/conversationsplus/generator/MessageGenerator.java
+++ b/src/main/java/de/thedevstack/conversationsplus/generator/MessageGenerator.java
@@ -4,7 +4,6 @@ import net.java.otr4j.OtrException;
 import net.java.otr4j.session.Session;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
@@ -25,6 +24,10 @@ import de.thedevstack.conversationsplus.xmpp.stanzas.MessagePacket;
 
 public class MessageGenerator extends AbstractGenerator {
 
+	@Deprecated
+	/**
+	 * Moved to messaging.MessageGenerator
+	 */
 	private MessagePacket preparePacket(Message message) {
 		Conversation conversation = message.getConversation();
 		Account account = conversation.getAccount();
@@ -48,9 +51,7 @@ public class MessageGenerator extends AbstractGenerator {
 		}
 		packet.setFrom(account.getJid());
 		packet.setId(message.getUuid());
-		if (message.edited()) {
-			packet.addChild("replace","urn:xmpp:message-correct:0").setAttribute("id",message.getEditedId());
-		}
+
 		return packet;
 	}
 
@@ -112,7 +113,7 @@ public class MessageGenerator extends AbstractGenerator {
 			FileParams fileParams = message.getFileParams();
 			content = message.getBody();
             if (message.isHttpUploaded()) {
-                packet.addChild(new HttpUploadHint());
+                packet.addChild(HttpUploadHint.HTTP_UPLOAD_HINT.getXmlElement());
             }
 			packet.addChild("x","jabber:x:oob").addChild("url").setContent(content);
             if (fileParams.getWidth() > 0 && fileParams.getHeight() > 0) {
@@ -192,17 +193,6 @@ public class MessageGenerator extends AbstractGenerator {
 		return packet;
 	}
 
-	public MessagePacket received(Account account, MessagePacket originalMessage, ArrayList<String> namespaces, int type) {
-		MessagePacket receivedPacket = new MessagePacket();
-		receivedPacket.setType(type);
-		receivedPacket.setTo(originalMessage.getFrom());
-		receivedPacket.setFrom(account.getJid());
-		for(String namespace : namespaces) {
-			receivedPacket.addChild("received", namespace).setAttribute("id", originalMessage.getId());
-		}
-		return receivedPacket;
-	}
-
 	public MessagePacket generateOtrError(Jid to, String id, String errorText) {
 		MessagePacket packet = new MessagePacket();
 		packet.setType(MessagePacket.TYPE_ERROR);
-- 
cgit v1.2.3