diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-02-24 13:02:33 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-02-24 13:02:33 +0100 |
| commit | 8b0ffd048e39b928d4bdbd964e1a89735c358e80 (patch) | |
| tree | 86bb4358f1997225047ed4abb709eeab17d90009 /src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java | |
| parent | 7d95bb60384101997e9a9480436edd9554d83429 (diff) | |
Fixed merge issue for resolving FS#47 (preferences involved in the decision for auto downloading image links moved to global Utility Class)
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 | 2 |
1 files changed, 1 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 e92acce4..052f59c6 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,7 @@ public class JingleConnection implements Transferable { conversation.add(message); mXmppConnectionService.updateConversationUi(); if (mJingleConnectionManager.hasStoragePermission() - && size < this.mJingleConnectionManager.getAutoAcceptFileSize()) { + && size < ConversationsPlusPreferences.autoAcceptFileSize()) { Logging.d(Config.LOGTAG, "auto accepting file from "+ packet.getFrom()); this.acceptedAutomatically = true; this.sendAccept(); |