diff options
| author | Claas Beyersdorf <claas.beyersdorf@iant.de> | 2015-09-23 17:00:19 +0200 |
|---|---|---|
| committer | Claas Beyersdorf <claas.beyersdorf@iant.de> | 2015-09-23 17:00:19 +0200 |
| commit | 695eec89e2e010de5b5016118f35927be92e351b (patch) | |
| tree | 124d0b8aeede873aadc8ab708478d059b1cac4b2 | |
| parent | 229d61181385b822121b4c806d1f22271e09a1ce (diff) | |
| download | jitsi-695eec89e2e010de5b5016118f35927be92e351b.zip jitsi-695eec89e2e010de5b5016118f35927be92e351b.tar.gz jitsi-695eec89e2e010de5b5016118f35927be92e351b.tar.bz2 | |
Fixed copy paste error. Now FORCE_PROXY_BYPASS works as expected.
3 files changed, 9 insertions, 7 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipStackSharing.java b/src/net/java/sip/communicator/impl/protocol/sip/SipStackSharing.java index 8415e55..8595cd0 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/SipStackSharing.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/SipStackSharing.java @@ -1031,13 +1031,15 @@ public class SipStackSharing while (iterPP.hasNext()) { ProtocolProviderServiceSipImpl candidate = iterPP.next(); - if(candidate.getAccountID() - .getAccountPropertyBoolean( - ProtocolProviderFactory.FORCE_PROXY_BYPASS, false)) + boolean forceProxyBypass + = candidate.getAccountID() + .getAccountPropertyBoolean( + ProtocolProviderFactory.FORCE_PROXY_BYPASS, false); + if(forceProxyBypass) { // Proxy check is disabled all connections are ok (HA sipXecs, sipXcom, ...) continue; - } + } if(candidate.getRegistrarConnection() == null) { //RegistrarLess connections are ok diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java index db42a0f..b9a24d0 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/ConnectionPanel.java @@ -129,8 +129,7 @@ public class ConnectionPanel } }); - proxyForceBypassCheckBox = - new SIPCommCheckBox( + proxyForceBypassCheckBox = new SIPCommCheckBox( Resources.getString("plugin.sipaccregwizz.PROXY_FORCE_BYPASS"), regform.getRegistration().isProxyForceBypassConfigure()); enablesProxyForceBypassConfigure(proxyForceBypassCheckBox.isSelected()); @@ -861,7 +860,7 @@ public class ConnectionPanel */ boolean isProxyForceBypassConfigureEnabled() { - return proxyAutoCheckBox.isSelected(); + return proxyForceBypassCheckBox.isSelected(); } /** diff --git a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java index 722b3a1..348805e 100644 --- a/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java +++ b/src/net/java/sip/communicator/plugin/sipaccregwizz/SIPAccountRegistrationForm.java @@ -433,6 +433,7 @@ public class SIPAccountRegistrationForm connectionPanel.setCertificateId(clientTlsCertificateId); connectionPanel.enablesProxyAutoConfigure(proxyAutoConfigureEnabled); + connectionPanel.enablesProxyForceBypassConfigure(proxyForceBypassConfigureEnabled); connectionPanel.setServerPort(serverPort); connectionPanel.setProxy(proxyAddress); |