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

Add ProxyInfo for connection config

Browse Source
This commit is contained in:
alexander
2016-03-29 12:03:20 -04:00
parent 4c123b39f2
commit 4fcd38a7cf
2 changed files with 59 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -251,9 +251,8 @@ public class LoginDialog {
ConnectionConfiguration config = null;
ProxyInfo proxyInfo = null;
if (localPref.isProxyEnabled()) {
ProxyInfo.ProxyType pType = localPref.getProtocol().equals("SOCKS5") ?
ProxyInfo.ProxyType pType = localPref.getProtocol().equals("SOCKS") ?
ProxyInfo.ProxyType.SOCKS5 : ProxyInfo.ProxyType.HTTP;
String pHost = ModelUtil.hasLength(localPref.getHost()) ?
localPref.getHost() : null;
@ -265,10 +264,14 @@ public class LoginDialog {
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!");
@ -284,15 +287,41 @@ public class LoginDialog {
config = new ConnectionConfiguration(localPref.getXmppHost(), port, loginServer);
config.setSocketFactory(new DummySSLSocketFactory());
}
if(localPref.isProxyEnabled() && !hostPortConfigured)
{
config = new ConnectionConfiguration(loginServer,5223,proxyInfo);
}
else if(localPref.isProxyEnabled() && !hostPortConfigured)
{
config = new ConnectionConfiguration(localPref.getXmppHost(), port, loginServer,proxyInfo);
}
}
else {
if(!localPref.isProxyEnabled())
{
if (!hostPortConfigured) {
config = new ConnectionConfiguration(loginServer);
}
else {
config = new ConnectionConfiguration(localPref.getXmppHost(), port, loginServer);
}
}
else
{
if (!hostPortConfigured) {
config = new ConnectionConfiguration(loginServer,proxyInfo);
}
else {
config = new ConnectionConfiguration(localPref.getXmppHost(), port, loginServer,proxyInfo);
}
}
}
config.setReconnectionAllowed(true);
@ -704,7 +733,22 @@ public class LoginDialog {
}
}
else if (e.getSource() == loginButton) {
validateLogin();
if(SettingsManager.getLocalPreferences().isProxyEnabled())
{
try
{
updateProxyConfig();
}
catch(Exception ex)
{
Log.error("MyException"+ex);
}
}
validateLogin();
}
else if (e.getSource() == advancedButton) {
final LoginSettingDialog loginSettingsDialog = new LoginSettingDialog();
@ -1110,6 +1154,8 @@ public class LoginDialog {
sessionManager.setJID(connection.getUser());
}
catch (Exception xee) {
if (!loginDialog.isVisible()) {
loginDialog.setVisible(true);
}