Merge branch 'trz/rebase' into trz/rename

1 files changed, 8 insertions, 5 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
index b02677a8..53fbb107 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
@@ -469,15 +469,18 @@ public class MessageParser extends AbstractParser implements
 			if (message.getEncryption() == Message.ENCRYPTION_NONE || !ConversationsPlusPreferences.dontSaveEncrypted()) {
 				mXmppConnectionService.databaseBackend.createMessage(message);
 			}
+            MessageUtil.extractFileParamsFromBody(message);
+            FileParams fileParams = message.getFileParams();
+            if (message.treatAsDownloadable() != Message.Decision.NEVER && message.treatAsDownloadable() != Message.Decision.NOT_DECIDED) {
+                if (null != fileParams) {
+                    fileParams.setFileStatus(FileStatus.NEEDS_DOWNLOAD);
+                }
+            }
 			if (message.trusted()
                     && message.treatAsDownloadable() != Message.Decision.NEVER
                     && ConversationsPlusPreferences.autoAcceptFileSize() > 0
                     && (message.isHttpUploaded() || ConversationsPlusPreferences.autoDownloadFileLink())) {
-                FileParams fileParams = new FileParams();
-                fileParams.setFileStatus(FileStatus.NEEDS_DOWNLOAD);
-                fileParams.setUrl(message.getBody());
-                message.setFileParams(fileParams);
-				HttpConnectionManager.createNewDownloadConnection(message);
+                HttpConnectionManager.createNewDownloadConnection(message);
 			} else {
 				if (query == null) {
 					mXmppConnectionService.getNotificationService().push(message);