diff options
author | lookshe <github@lookshe.org> | 2015-04-12 21:28:45 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2015-04-12 21:28:45 +0200 |
commit | 7405d50c70808efc0f01aa6c00dc9a20c970ec47 (patch) | |
tree | f10a19c8837f763dfc2da54759b01e7dbb2547fe /src/main/java/eu/siacs/conversations/parser | |
parent | 56e695cf1be3c519d749e3736bdc60a39b43fd8d (diff) |
implementation for downloading only when enabled wlan
Diffstat (limited to 'src/main/java/eu/siacs/conversations/parser')
-rw-r--r-- | src/main/java/eu/siacs/conversations/parser/MessageParser.java | 6 |
1 files changed, 5 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 076de66f..064a1662 100644 --- a/src/main/java/eu/siacs/conversations/parser/MessageParser.java +++ b/src/main/java/eu/siacs/conversations/parser/MessageParser.java @@ -619,7 +619,11 @@ public class MessageParser extends AbstractParser implements } } final HttpConnectionManager manager = this.mXmppConnectionService.getHttpConnectionManager(); - if (message.trusted() && Settings.DOWNLOAD_IMAGE_LINKS && message.bodyContainsDownloadable() && manager.getAutoAcceptFileSize() > 0) { + if (message.trusted() + && Settings.DOWNLOAD_IMAGE_LINKS + && mXmppConnectionService.isDownloadAllowedInConnection() + && message.bodyContainsDownloadable() + && manager.getAutoAcceptFileSize() > 0) { manager.createNewConnection(message); } else if (!message.isRead()) { mXmppConnectionService.getNotificationService().push(message); |