diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-10-23 22:26:55 +0200 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-10-23 22:26:55 +0200 |
| commit | 389e3d4f0f5116f5ea22cc7c5e8cec1e6c791e3a (patch) | |
| tree | de9aad5a69444199fccef87f81709bde5a7689b3 /src/main/java/eu/siacs/conversations/http | |
| parent | bdc211a67a25298eb05854ff7e98461223e21bc5 (diff) | |
| parent | 7aed735df28984e76486f23d17d02981b268930e (diff) | |
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/http')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java | 3 |
1 files changed, 2 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 45f1e965..94a76837 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java +++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java @@ -16,6 +16,7 @@ import java.util.Arrays; import javax.net.ssl.HttpsURLConnection; import javax.net.ssl.SSLHandshakeException; +import de.thedevstack.conversationsplus.ConversationsPlusPreferences; import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Transferable; @@ -150,7 +151,7 @@ public class HttpDownloadConnection implements Transferable { return; } file.setExpectedSize(size); - if (size != -1 && size <= mHttpConnectionManager.getAutoAcceptFileSize()) { + if (size != -1 && size <= ConversationsPlusPreferences.autoAcceptFileSize()) { HttpDownloadConnection.this.acceptedAutomatically = true; new Thread(new FileDownloader(interactive)).start(); } else { |