1 files changed, 9 insertions, 13 deletions
diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index c003da43..582d64e6 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -10,6 +10,7 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+import de.thedevstack.conversationsplus.entities.FileParams;
 import de.thedevstack.conversationsplus.xmpp.httpuploadim.HttpUploadHint;
 
 import eu.siacs.conversations.crypto.axolotl.XmppAxolotlMessage;
@@ -71,13 +72,13 @@ public class MessageGenerator extends AbstractGenerator {
 		return packet;
 	}
 
-    public static void addXhtmlImImage(MessagePacket packet, Message.FileParams params) {
+    public static void addXhtmlImImage(MessagePacket packet, 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);
+        img.setAttribute("src", params.getUrl());
+        img.setAttribute("height", params.getHeight());
+        img.setAttribute("width", params.getWidth());
     }
 
 	public static void addMessageHints(MessagePacket packet) {
@@ -95,12 +96,7 @@ public class MessageGenerator extends AbstractGenerator {
 		MessagePacket packet = preparePacket(message);
 		addMessageHints(packet);
 		try {
-			String content;
-			if (message.hasFileOnRemoteHost()) {
-				content = message.getFileParams().url.toString();
-			} else {
-				content = message.getBody();
-			}
+			String content = message.getBody();
 			packet.setBody(otrSession.transformSending(content)[0]);
 			return packet;
 		} catch (OtrException e) {
@@ -112,13 +108,13 @@ public class MessageGenerator extends AbstractGenerator {
 		MessagePacket packet = preparePacket(message);
 		String content;
 		if (message.hasFileOnRemoteHost()) {
-			Message.FileParams fileParams = message.getFileParams();
-			content = fileParams.url.toString();
+			FileParams fileParams = message.getFileParams();
+			content = message.getBody();
             if (message.isHttpUploaded()) {
                 packet.addChild(new HttpUploadHint());
             }
 			packet.addChild("x","jabber:x:oob").addChild("url").setContent(content);
-            if (fileParams.width > 0 && fileParams.height > 0) {
+            if (fileParams.getWidth() > 0 && fileParams.getHeight() > 0) {
                 addXhtmlImImage(packet, fileParams);
             }
 		} else {