From 4623fafa2eb88f076f579e1ef3938461d867d52e Mon Sep 17 00:00:00 2001 From: Daniel Gultsch Date: Sat, 27 Aug 2016 13:35:52 +0200 Subject: don't automatically download files and avatars when datasaver is on --- src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java') 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(); -- cgit v1.2.3