Merge branch 'trz/rebase' into trz/rename

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
index 861082d8..3284a936 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java
@@ -1,23 +1,23 @@
 package de.thedevstack.conversationsplus.xmpp.jingle;
 
+import android.annotation.SuppressLint;
+
 import java.math.BigInteger;
 import java.security.SecureRandom;
 import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
-import android.annotation.SuppressLint;
 
 import de.thedevstack.android.logcat.Logging;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.entities.Account;
-import de.thedevstack.conversationsplus.entities.Transferable;
 import de.thedevstack.conversationsplus.entities.Message;
+import de.thedevstack.conversationsplus.entities.Transferable;
 import de.thedevstack.conversationsplus.services.AbstractConnectionManager;
 import de.thedevstack.conversationsplus.services.XmppConnectionService;
 import de.thedevstack.conversationsplus.utils.Xmlns;
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.OnIqPacketReceived;
-import de.thedevstack.conversationsplus.xmpp.jid.InvalidJidException;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
 import de.thedevstack.conversationsplus.xmpp.jingle.stanzas.JinglePacket;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
@@ -83,7 +83,7 @@ public class JingleConnectionManager extends AbstractConnectionManager {
 
 	public void getPrimaryCandidate(Account account,
 			final OnPrimaryCandidateFound listener) {
-		if (Config.NO_PROXY_LOOKUP) {
+		if (Config.DISABLE_PROXY_LOOKUP) {
 			listener.onPrimaryCandidateFound(false, null);
 			return;
 		}