Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

Conflicts:
	src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java
	src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java
	src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java
	src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
	src/main/java/eu/siacs/conversations/ui/SettingsActivity.java

1 files changed, 5 insertions, 0 deletions

diff --git a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
index 2d7b66b5..c003da43 100644
--- a/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
+++ b/src/main/java/eu/siacs/conversations/generator/MessageGenerator.java
@@ -10,6 +10,8 @@ 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;
@@ -112,6 +114,9 @@ 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);