diff options
author | lookshe <github@lookshe.org> | 2016-03-07 23:39:41 +0100 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2016-03-07 23:39:41 +0100 |
commit | c8759af913b775645b5394eb3c1f08d8c5fe9238 (patch) | |
tree | 1bf91bf7f5120d91e7882553307904b3cd70a967 /src/main/java/eu/siacs/conversations/http | |
parent | 6578ecfe0e79c1d00d2282e05e28d5a4c950b687 (diff) |
Fixes FS#151 - Missing button on image-links
Diffstat (limited to 'src/main/java/eu/siacs/conversations/http')
-rw-r--r-- | src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java index 1470d250..b47ff96c 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java @@ -184,7 +184,9 @@ public class HttpDownloadConnection implements Transferable { return; } file.setExpectedSize(size); - if (size != -1 && size <= ConversationsPlusPreferences.autoAcceptFileSize()) { + if (size != -1 + && size <= ConversationsPlusPreferences.autoAcceptFileSize() + && mXmppConnectionService.isDownloadAllowedInConnection()) { HttpDownloadConnection.this.acceptedAutomatically = true; new Thread(new FileDownloader(interactive)).start(); } else { |