diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-08-27 13:35:52 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-08-27 13:35:52 +0200 |
| commit | caafd0313027fc81b7cf529e84df33461a7f9a90 (patch) | |
| tree | bf71f9216aa8e7c93f4037db192eb2ce074864e5 /src/main/java/eu/siacs/conversations/xmpp | |
| parent | 3d5940cb76932787a5a8f9410abaa04123a03efb (diff) | |
don't automatically download files and avatars when datasaver is on
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
| -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 89ab30cd..3099b570 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java @@ -389,7 +389,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(); |