1 files changed, 20 insertions, 7 deletions

diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index 0e7a8ce6..c003da43 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -9,20 +9,19 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.TimeZone;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.xmpp.httpuploadim.HttpUploadHint;
+
 import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
 import eu.siacs.conversations.entities.Message;
-import eu.siacs.conversations.services.XmppConnectionService;
 import eu.siacs.conversations.xml.Element;
 import eu.siacs.conversations.xmpp.chatstate.ChatState;
 import eu.siacs.conversations.xmpp.jid.Jid;
 import eu.siacs.conversations.xmpp.stanzas.MessagePacket;
 
 public class MessageGenerator extends AbstractGenerator {
-	public MessageGenerator(XmppConnectionService service) {
-		super(service);
-	}
 
 	private MessagePacket preparePacket(Message message) {
 		Conversation conversation = message.getConversation();
@@ -32,13 +31,13 @@ public class MessageGenerator extends AbstractGenerator {
 			packet.setTo(message.getCounterpart());
 			packet.setType(MessagePacket.TYPE_CHAT);
 			packet.addChild("markable", "urn:xmpp:chat-markers:0");
-			if (this.mXmppConnectionService.indicateReceived()) {
+			if (ConversationsPlusPreferences.indicateReceived()) {
 				packet.addChild("request", "urn:xmpp:receipts");
 			}
 		} else if (message.getType() == Message.TYPE_PRIVATE) {
 			packet.setTo(message.getCounterpart());
 			packet.setType(MessagePacket.TYPE_CHAT);
-			if (this.mXmppConnectionService.indicateReceived()) {
+			if (ConversationsPlusPreferences.indicateReceived()) {
 				packet.addChild("request", "urn:xmpp:receipts");
 			}
 		} else {
@@ -72,6 +71,15 @@ public class MessageGenerator extends AbstractGenerator {
 		return packet;
 	}
 
+    public static void addXhtmlImImage(MessagePacket packet, Message.FileParams params) {
+        Element html = packet.addChild("html", "http://jabber.org/protocol/xhtml-im");
+        Element body = html.addChild("body", "http://www.w3.org/1999/xhtml");
+        Element img = body.addChild("img");
+        img.setAttribute("src", params.url.toString());
+        img.setAttribute("height", params.height);
+        img.setAttribute("width", params.width);
+    }
+
 	public static void addMessageHints(MessagePacket packet) {
 		packet.addChild("private", "urn:xmpp:carbons:2");
 		packet.addChild("no-copy", "urn:xmpp:hints");
@@ -106,7 +114,13 @@ public class MessageGenerator extends AbstractGenerator {
 		if (message.hasFileOnRemoteHost()) {
 			Message.FileParams fileParams = message.getFileParams();
 			content = fileParams.url.toString();
+            if (message.isHttpUploaded()) {
+                packet.addChild(new HttpUploadHint());
+            }
 			packet.addChild("x","jabber:x:oob").addChild("url").setContent(content);
+            if (fileParams.width > 0 && fileParams.height > 0) {
+                addXhtmlImImage(packet,fileParams);
+            }
 		} else {
 			content = message.getBody();
 		}
@@ -144,7 +158,6 @@ public class MessageGenerator extends AbstractGenerator {
 		packet.setFrom(account.getJid());
 		Element received = packet.addChild("displayed", "urn:xmpp:chat-markers:0");
 		received.setAttribute("id", id);
-		packet.addChild("store", "urn:xmpp:hints");
 		return packet;
 	}