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

do not expect stream features after inline resume

Browse source
This commit is contained in:
Daniel Gultsch 2022-11-17 10:52:30 +01:00
parent 29461edf40
commit 109a20ca40
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -771,7 +771,7 @@ public class XmppConnection implements Runnable {
+ ": server sent bound and resumed in SASL2 success"); + ": server sent bound and resumed in SASL2 success");
throw new StateChangingException(Account.State.INCOMPATIBLE_SERVER); throw new StateChangingException(Account.State.INCOMPATIBLE_SERVER);
} }
final boolean processNopStreamFeatures = (resumed != null && streamId != null) || bound != null; final boolean processNopStreamFeatures;
if (resumed != null && streamId != null) { if (resumed != null && streamId != null) {
processResumed(resumed); processResumed(resumed);
} else if (failed != null) { } else if (failed != null) {
@ -798,6 +798,9 @@ public class XmppConnection implements Runnable {
features.carbonsEnabled = true; features.carbonsEnabled = true;
} }
sendPostBindInitialization(waitForDisco, carbonsEnabled != null); sendPostBindInitialization(waitForDisco, carbonsEnabled != null);
processNopStreamFeatures = true;
} else {
processNopStreamFeatures = false;
} }
final HashedToken.Mechanism tokenMechanism; final HashedToken.Mechanism tokenMechanism;
if (SaslMechanism.hashedToken(currentSaslMechanism)) { if (SaslMechanism.hashedToken(currentSaslMechanism)) {
@ -811,6 +814,7 @@ public class XmppConnection implements Runnable {
this.account.setFastToken(tokenMechanism,token); this.account.setFastToken(tokenMechanism,token);
Log.d(Config.LOGTAG,account.getJid().asBareJid()+": storing hashed token "+tokenMechanism); Log.d(Config.LOGTAG,account.getJid().asBareJid()+": storing hashed token "+tokenMechanism);
} }
// TODO it is currently unclear if a successful resume triggers new stream features or not
if (processNopStreamFeatures) { if (processNopStreamFeatures) {
processNopStreamFeatures(); processNopStreamFeatures();
} }
@ -1354,7 +1358,7 @@ public class XmppConnection implements Runnable {
Log.d( Log.d(
Config.LOGTAG, Config.LOGTAG,
account.getJid().asBareJid() account.getJid().asBareJid()
+ ": received NOP stream features " + ": received NOP stream features: "
+ XmlHelper.printElementNames(this.streamFeatures)); + XmlHelper.printElementNames(this.streamFeatures));
} }
} }