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/xmpp/jingle/JingleConnection.java | |
| parent | 6578ecfe0e79c1d00d2282e05e28d5a4c950b687 (diff) | |
Fixes FS#151 - Missing button on image-links
Diffstat (limited to '')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java index 052f59c6..26e6d44d 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java @@ -366,7 +366,8 @@ public class JingleConnection implements Transferable { conversation.add(message); mXmppConnectionService.updateConversationUi(); if (mJingleConnectionManager.hasStoragePermission() - && size < ConversationsPlusPreferences.autoAcceptFileSize()) { + && size <= ConversationsPlusPreferences.autoAcceptFileSize() + && mXmppConnectionService.isDownloadAllowedInConnection()) { Logging.d(Config.LOGTAG, "auto accepting file from "+ packet.getFrom()); this.acceptedAutomatically = true; this.sendAccept(); |