forked from External/mage
connection: disabled outdated proxy settings (#13323)
This commit is contained in:
parent
19269b22b0
commit
62ba9f02ba
5 changed files with 40 additions and 19 deletions
|
|
@ -949,11 +949,15 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
|
|||
} catch (SocketException ex) {
|
||||
}
|
||||
currentConnection.setUserIdStr(System.getProperty("user.name") + ":" + System.getProperty("os.name") + ":" + MagePreferences.getUserNames() + ":" + allMAC);
|
||||
currentConnection.setProxyType(proxyType);
|
||||
currentConnection.setProxyHost(proxyServer);
|
||||
currentConnection.setProxyPort(proxyPort);
|
||||
currentConnection.setProxyUsername(proxyUsername);
|
||||
currentConnection.setProxyPassword(proxyPassword);
|
||||
if (PreferencesDialog.NETWORK_ENABLE_PROXY_SUPPORT) {
|
||||
currentConnection.setProxyType(proxyType);
|
||||
currentConnection.setProxyHost(proxyServer);
|
||||
currentConnection.setProxyPort(proxyPort);
|
||||
currentConnection.setProxyUsername(proxyUsername);
|
||||
currentConnection.setProxyPassword(proxyPassword);
|
||||
} else {
|
||||
currentConnection.setProxyType(ProxyType.NONE);
|
||||
}
|
||||
setUserPrefsToConnection(currentConnection);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue