force tls for registrations as well
This commit is contained in:
parent
a201f9e53f
commit
c9238ef5ae
|
@ -583,10 +583,10 @@ public class XmppConnection implements Runnable {
|
||||||
} else if (compressionAvailable()) {
|
} else if (compressionAvailable()) {
|
||||||
sendCompressionZlib();
|
sendCompressionZlib();
|
||||||
} else if (this.streamFeatures.hasChild("register")
|
} else if (this.streamFeatures.hasChild("register")
|
||||||
&& (account.isOptionSet(Account.OPTION_REGISTER))) {
|
&& account.isOptionSet(Account.OPTION_REGISTER) && usingEncryption) {
|
||||||
sendRegistryRequest();
|
sendRegistryRequest();
|
||||||
} else if (!this.streamFeatures.hasChild("register")
|
} else if (!this.streamFeatures.hasChild("register")
|
||||||
&& (account.isOptionSet(Account.OPTION_REGISTER))) {
|
&& account.isOptionSet(Account.OPTION_REGISTER)) {
|
||||||
changeStatus(Account.STATUS_REGISTRATION_NOT_SUPPORTED);
|
changeStatus(Account.STATUS_REGISTRATION_NOT_SUPPORTED);
|
||||||
disconnect(true);
|
disconnect(true);
|
||||||
} else if (this.streamFeatures.hasChild("mechanisms")
|
} else if (this.streamFeatures.hasChild("mechanisms")
|
||||||
|
@ -606,6 +606,9 @@ public class XmppConnection implements Runnable {
|
||||||
this.tagWriter.writeStanzaAsync(resume);
|
this.tagWriter.writeStanzaAsync(resume);
|
||||||
} else if (this.streamFeatures.hasChild("bind") && shouldBind) {
|
} else if (this.streamFeatures.hasChild("bind") && shouldBind) {
|
||||||
sendBindRequest();
|
sendBindRequest();
|
||||||
|
} else {
|
||||||
|
Log.d(Config.LOGTAG,account.getJid()+": incompatible server. disconnecting");
|
||||||
|
disconnect(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue