diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-06-30 20:19:38 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-06-30 20:19:38 +0200 |
| commit | ed88b634fc8354d45df95745836dc5db0d58176b (patch) | |
| tree | cdaae0ae0a1ac7842db872522717fcb5699e1a60 /src/main/java/eu/siacs/conversations/parser | |
| parent | a2a1f1e0847952c1b6f08f003cd78ad5520a3db6 (diff) | |
| parent | c36238141de719442e3f542019e68e268f2f2265 (diff) | |
Merge branch 'feature/http_upload' into development
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/parser/MessageParser.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/parser/MessageParser.java b/src/main/java/eu/siacs/conversations/parser/MessageParser.java index 5a40b1708..6d2aebf26 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -360,7 +360,7 @@ public class MessageParser extends AbstractParser implements mXmppConnectionService.databaseBackend.createMessage(message); } final HttpConnectionManager manager = this.mXmppConnectionService.getHttpConnectionManager(); - if (message.trusted() && message.bodyContainsDownloadable() && manager.getAutoAcceptFileSize() > 0) { + if (message.trusted() && message.treatAsDownloadable() == Message.Decision.YES && manager.getAutoAcceptFileSize() > 0) { manager.createNewConnection(message); } else if (!message.isRead()) { mXmppConnectionService.getNotificationService().push(message); |