mirror/Spark
3
0
Fork 0
mirror of https://github.com/igniterealtime/Spark.git synced 2025-12-01 12:27:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #63 from igniterealtime/proxy-patch

Browse Source 
Applying old proxy patch
https://igniterealtime.org/issues/browse/SPARK-1066
This commit is contained in:
wroot
2015-12-15 21:52:01 +02:00
parent bb3093e6c2 9f462ea937
commit c0eeb5a7a5
1 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/java/org/jivesoftware/LoginDialog.java
View File

@ -89,6 +89,7 @@ import org.jivesoftware.resource.Default;
import org.jivesoftware.resource.Res; import org.jivesoftware.resource.Res;
import org.jivesoftware.resource.SparkRes; import org.jivesoftware.resource.SparkRes;
import org.jivesoftware.smack.ConnectionConfiguration; import org.jivesoftware.smack.ConnectionConfiguration;
import org.jivesoftware.smack.proxy.ProxyInfo;
import org.jivesoftware.smack.SASLAuthentication; import org.jivesoftware.smack.SASLAuthentication;
import org.jivesoftware.smack.SmackConfiguration; import org.jivesoftware.smack.SmackConfiguration;
import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.XMPPConnection;
@ -249,6 +250,31 @@ public class LoginDialog {
ConnectionConfiguration config = null; ConnectionConfiguration config = null;
ProxyInfo proxyInfo = null;
if (localPref.isProxyEnabled()) {
ProxyInfo.ProxyType pType = localPref.getProtocol().equals("SOCKS5") ?
ProxyInfo.ProxyType.SOCKS5 : ProxyInfo.ProxyType.HTTP;
String pHost = ModelUtil.hasLength(localPref.getHost()) ?
localPref.getHost() : null;
int pPort = ModelUtil.hasLength(localPref.getPort()) ?
Integer.parseInt(localPref.getPort()) : 0;
String pUser = ModelUtil.hasLength(localPref.getProxyUsername()) ?
localPref.getProxyUsername() : null;
String pPass = ModelUtil.hasLength(localPref.getProxyPassword()) ?
localPref.getProxyPassword() : null;
if (pHost != null && pPort != 0) {
if (pUser == null || pPass == null) {
proxyInfo = new ProxyInfo(pType, pHost, pPort, null, null);
} else {
proxyInfo = new ProxyInfo(pType, pHost, pPort, pUser, pPass);
}
} else {
Log.error("No proxy info found but proxy type is enabled!");
}
}
if (useSSL) { if (useSSL) {
if (!hostPortConfigured) { if (!hostPortConfigured) {
config = new ConnectionConfiguration(loginServer, 5223); config = new ConnectionConfiguration(loginServer, 5223);