aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/parser
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-07 23:42:13 +0100
committerlookshe <github@lookshe.org>2016-03-07 23:42:13 +0100
commit5eda297b145558b4bcdbd0fb94f8a2675691971f (patch)
tree684e9c2b287566c4c1ec001889b82e34a5ca29b3 /src/main/java/de/thedevstack/conversationsplus/parser
parentd620dcdc575ff1ce4cbdaf78e3182f3418e2142d (diff)
parentc8759af913b775645b5394eb3c1f08d8c5fe9238 (diff)
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/parser')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
index fd89ad00..ee6ef8b6 100644
--- a/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java
@@ -443,8 +443,7 @@ public class MessageParser extends AbstractParser implements
if (message.trusted()
&& message.treatAsDownloadable() != Message.Decision.NEVER
&& ConversationsPlusPreferences.autoAcceptFileSize() > 0
- && ConversationsPlusPreferences.autoDownloadFileLink()
- && mXmppConnectionService.isDownloadAllowedInConnection()) {
+ && ConversationsPlusPreferences.autoDownloadFileLink()) {
manager.createNewDownloadConnection(message);
} else {
if (query == null) {