Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase

1 files changed, 5 insertions, 3 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 2c56488d..8d378824 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -12,6 +12,9 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.SystemClock;
 import android.util.Log;
+
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
+
 import eu.siacs.conversations.Config;
 import eu.siacs.conversations.entities.Account;
 import eu.siacs.conversations.entities.Conversation;
@@ -319,7 +322,7 @@ public class JingleConnection implements Transferable {
 				message.setBody(Long.toString(size));
 				conversation.add(message);
 				mXmppConnectionService.updateConversationUi();
-				if (size <= this.mJingleConnectionManager.getAutoAcceptFileSize()
+				if (size <= ConversationsPlusPreferences.autoAcceptFileSize()
                         && mXmppConnectionService.isDownloadAllowedInConnection()) {
 					Log.d(Config.LOGTAG, "auto accepting file from "
 							+ packet.getFrom());
@@ -331,8 +334,7 @@ public class JingleConnection implements Transferable {
 							"not auto accepting new file offer with size: "
 									+ size
 									+ " allowed size:"
-									+ this.mJingleConnectionManager
-											.getAutoAcceptFileSize());
+									+ ConversationsPlusPreferences.autoAcceptFileSize());
 					this.mXmppConnectionService.getNotificationService()
 							.push(message);
 				}