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/xmpp/jingle/JingleConnection.java | |
| parent | 56e695cf1be3c519d749e3736bdc60a39b43fd8d (diff) | |
implementation for downloading only when enabled wlan
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java | 4 |
1 files changed, 2 insertions, 2 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 2d949e21..0db0deee 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java @@ -317,8 +317,8 @@ public class JingleConnection implements Downloadable { message.setBody(Long.toString(size)); conversation.add(message); mXmppConnectionService.updateConversationUi(); - if (size <= this.mJingleConnectionManager - .getAutoAcceptFileSize()) { + if (size <= this.mJingleConnectionManager.getAutoAcceptFileSize() + && mXmppConnectionService.isDownloadAllowedInConnection()) { Log.d(Config.LOGTAG, "auto accepting file from " + packet.getFrom()); this.acceptedAutomatically = true; |