narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

remove unnecessary resume call

Browse source
This commit is contained in:
Daniel Gultsch 2024-02-07 09:15:36 +01:00
parent 961a024aa2
commit 7455e99761
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
View file

@ -1453,6 +1453,8 @@ public class XmppConnection implements Runnable {
&& isSecure) { && isSecure) {
authenticate(SaslMechanism.Version.SASL); authenticate(SaslMechanism.Version.SASL);
} else if (this.streamFeatures.hasChild("sm", Namespace.STREAM_MANAGEMENT) } else if (this.streamFeatures.hasChild("sm", Namespace.STREAM_MANAGEMENT)
&& isSecure
&& loginInfo != null
&& streamId != null && streamId != null
&& !inSmacksSession) { && !inSmacksSession) {
if (Config.EXTENDED_SM_LOGGING) { if (Config.EXTENDED_SM_LOGGING) {
@ -1467,7 +1469,9 @@ public class XmppConnection implements Runnable {
this.mWaitingForSmCatchup.set(true); this.mWaitingForSmCatchup.set(true);
this.tagWriter.writeStanzaAsync(resume); this.tagWriter.writeStanzaAsync(resume);
} else if (needsBinding) { } else if (needsBinding) {
if (this.streamFeatures.hasChild("bind", Namespace.BIND) && isSecure) { if (this.streamFeatures.hasChild("bind", Namespace.BIND)
&& isSecure
&& loginInfo != null) {
sendBindRequest(); sendBindRequest();
} else { } else {
Log.d( Log.d(
@ -1478,7 +1482,6 @@ public class XmppConnection implements Runnable {
throw new StateChangingException(Account.State.INCOMPATIBLE_SERVER); throw new StateChangingException(Account.State.INCOMPATIBLE_SERVER);
} }
} else { } else {
Log.d( Log.d(
Config.LOGTAG, Config.LOGTAG,
account.getJid().asBareJid() account.getJid().asBareJid()