prepare proxy info (but not turn on due to Smack issue)

Grigory Fedorov · Grigory Fedorov · commit 9702fdb3a18b · 2016-04-04T18:25:35.000+05:00
diff --git a/xabber/src/main/java/com/xabber/android/data/connection/ConnectionBuilder.java b/xabber/src/main/java/com/xabber/android/data/connection/ConnectionBuilder.java
@@ -7,6 +7,7 @@
 import com.xabber.android.data.SettingsManager;
 
 import org.jivesoftware.smack.SASLAuthentication;
+import org.jivesoftware.smack.proxy.ProxyInfo;
 import org.jivesoftware.smack.sasl.provided.SASLPlainMechanism;
 import org.jivesoftware.smack.tcp.XMPPTCPConnection;
 import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
@@ -61,6 +62,48 @@ public class ConnectionBuilder {
         return new XMPPTCPConnection(builder.build());
     }
 
+    private static ProxyInfo getProxyInfo(ConnectionSettings connectionSettings) {
+
+        ProxyInfo proxyInfo;
+
+        ProxyType proxyType = connectionSettings.getProxyType();
+
+        String proxyHost = connectionSettings.getProxyHost();
+        int proxyPort = connectionSettings.getProxyPort();
+        String proxyPassword = connectionSettings.getProxyPassword();
+        String proxyUser = connectionSettings.getProxyUser();
+
+        if (proxyType == null) {
+            proxyInfo = ProxyInfo.forDefaultProxy();
+        } else {
+            switch (proxyType) {
+                case none:
+                    proxyInfo = ProxyInfo.forNoProxy();
+                    break;
+                case http:
+                    proxyInfo = ProxyInfo.forHttpProxy(proxyHost, proxyPort, proxyUser, proxyPassword);
+                    break;
+                case socks4:
+                    proxyInfo = ProxyInfo.forSocks4Proxy(proxyHost, proxyPort, proxyUser, proxyPassword);
+                    break;
+                case socks5:
+                    proxyInfo = ProxyInfo.forSocks5Proxy(proxyHost, proxyPort, proxyUser, proxyPassword);
+                    break;
+                case orbot:
+                    proxyHost = "localhost";
+                    proxyPort = 9050;
+                    proxyPassword = "";
+                    proxyUser = "";
+                    proxyInfo = ProxyInfo.forSocks5Proxy(proxyHost, proxyPort, proxyUser, proxyPassword);
+                    break;
+                default:
+                    proxyInfo = ProxyInfo.forDefaultProxy();
+            }
+        }
+
+        return proxyInfo;
+    }
+
     private static void setUpSasl() {
         if (SettingsManager.connectionUsePlainTextAuth()) {
             final Map<String, String> registeredSASLMechanisms = SASLAuthentication.getRegisterdSASLMechanisms();
diff --git a/xabber/src/main/java/com/xabber/android/data/connection/ProxyType.java b/xabber/src/main/java/com/xabber/android/data/connection/ProxyType.java
@@ -1,7 +1,5 @@
 package com.xabber.android.data.connection;
 
-import org.jivesoftware.smack.proxy.ProxyInfo;
-
 public enum ProxyType {
 
     none,
@@ -14,27 +12,4 @@ public enum ProxyType {
 
     orbot;
 
-    public ProxyInfo getProxyInfo(String proxyHost, int proxyPort,
-                                  String proxyUser, String proxyPassword) {
-        ProxyInfo.ProxyType proxyType;
-        if (this == none)
-            proxyType = ProxyInfo.ProxyType.NONE;
-        else if (this == http)
-            proxyType = ProxyInfo.ProxyType.HTTP;
-        else if (this == socks4)
-            proxyType = ProxyInfo.ProxyType.SOCKS4;
-        else if (this == socks5)
-            proxyType = ProxyInfo.ProxyType.SOCKS5;
-        else if (this == orbot) {
-            proxyType = ProxyInfo.ProxyType.SOCKS5;
-            proxyHost = "localhost";
-            proxyPort = 9050;
-            proxyUser = "";
-            proxyPassword = "";
-        } else
-            throw new IllegalStateException();
-        return new ProxyInfo(proxyType, proxyHost, proxyPort, proxyUser,
-                proxyPassword);
-    }
-
 }
