mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-12-25 12:08:00 +01:00
Don't return if securityMode is 'disabled'
in afterFeaturesReceived. As this will cause maybeCompressFeaturesReceived.reportSuccess() never to be called if the server announces 'starttls' but security mode is set to 'disabled' and if 'compression' is also announced. Fixes SMACK-678.
This commit is contained in:
parent
4b0767ba9a
commit
d54dafc499
1 changed files with 2 additions and 4 deletions
|
@ -884,11 +884,9 @@ public class XMPPTCPConnection extends AbstractXMPPConnection {
|
|||
return;
|
||||
}
|
||||
|
||||
if (config.getSecurityMode() == ConnectionConfiguration.SecurityMode.disabled) {
|
||||
// Do not secure the connection using TLS since TLS was disabled
|
||||
return;
|
||||
if (config.getSecurityMode() != ConnectionConfiguration.SecurityMode.disabled) {
|
||||
send(new StartTls());
|
||||
}
|
||||
send(new StartTls());
|
||||
}
|
||||
// If TLS is required but the server doesn't offer it, disconnect
|
||||
// from the server and throw an error. First check if we've already negotiated TLS
|
||||
|
|
Loading…
Reference in a new issue