aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
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/http/HttpDownloadConnection.java
parentd620dcdc575ff1ce4cbdaf78e3182f3418e2142d (diff)
parentc8759af913b775645b5394eb3c1f08d8c5fe9238 (diff)
Merge branch 'trz/rebase' into trz/rename
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java')
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java b/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
index 4381ed03..0462defd 100644
--- a/src/main/java/de/thedevstack/conversationsplus/http/HttpDownloadConnection.java
+++ b/src/main/java/de/thedevstack/conversationsplus/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 {