diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-08-27 13:35:52 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-08-27 23:17:24 +0200 |
| commit | 4623fafa2eb88f076f579e1ef3938461d867d52e (patch) | |
| tree | 3fac3c68a74073cebc6f0f2ec77425fe74ebaa5e /src/main/java/de/pixart/messenger/xmpp | |
| parent | 5544f1f7120eacf22ee13c1348592cc52ddbe8c6 (diff) | |
don't automatically download files and avatars when datasaver is on
Diffstat (limited to 'src/main/java/de/pixart/messenger/xmpp')
| -rw-r--r-- | src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java index 29c5acfb8..0c8eec2bb 100644 --- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java +++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java @@ -393,7 +393,8 @@ public class JingleConnection implements Transferable { conversation.add(message); mXmppConnectionService.updateConversationUi(); if (mJingleConnectionManager.hasStoragePermission() - && size < this.mJingleConnectionManager.getAutoAcceptFileSize()) { + && size < this.mJingleConnectionManager.getAutoAcceptFileSize() + && mXmppConnectionService.isDataSaverDisabled()) { Log.d(Config.LOGTAG, "auto accepting file from "+ packet.getFrom()); this.acceptedAutomatically = true; this.sendAccept(); |