From 62bc6885db07423a434f945de9def863cb12b8c1 Mon Sep 17 00:00:00 2001
From: steckbrief <steckbrief@chefmail.de>
Date: Fri, 16 Feb 2018 21:04:29 +0100
Subject: introduces cancel status for file transfers, fixes NPE in file
 sharing after picture resize

---
 .../java/de/thedevstack/conversationsplus/parser/MessageParser.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java')

diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
index 4cc6f8b2..889adbac 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
@@ -490,7 +490,7 @@ public class MessageParser extends AbstractParser implements
 			if (message.trusted()
                     && message.treatAsDownloadable() != Message.Decision.NEVER
                     && ConversationsPlusPreferences.autoAcceptFileSize() > 0
-                    && (message.isHttpUploaded() || ConversationsPlusPreferences.autoDownloadFileLink())) {
+                    && (message.isHttpUploaded() || MessageUtil.hasDownloadableLink(message))) { // Can this be checked by MessageUtil.needsDownload(message) ??
 				HttpRetrieveHead hrh = new HttpRetrieveHead(message);
 				hrh.setListener(new AutomaticFileDownload(true));
 				hrh.retrieveAndSetContentTypeAndLength();
-- 
cgit v1.2.3