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

enable SM if it wasn’t enabled in bind 2

Browse source
This commit is contained in:
Daniel Gultsch 2022-10-14 13:29:59 +02:00
parent 9a0c90f066
commit 7eb160386d
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -780,8 +780,13 @@ public class XmppConnection implements Runnable {
final Element streamManagementEnabled = final Element streamManagementEnabled =
bound.findChild("enabled", Namespace.STREAM_MANAGEMENT); bound.findChild("enabled", Namespace.STREAM_MANAGEMENT);
final Element carbonsEnabled = bound.findChild("enabled", Namespace.CARBONS); final Element carbonsEnabled = bound.findChild("enabled", Namespace.CARBONS);
final boolean waitForDisco;
if (streamManagementEnabled != null) { if (streamManagementEnabled != null) {
processEnabled(streamManagementEnabled); processEnabled(streamManagementEnabled);
waitForDisco = true;
} else {
//if we didn’t enable stream managment in bind do it now
waitForDisco = enableStreamManagement();
} }
if (carbonsEnabled != null) { if (carbonsEnabled != null) {
Log.d( Log.d(
@ -789,9 +794,7 @@ public class XmppConnection implements Runnable {
account.getJid().asBareJid() + ": successfully enabled carbons"); account.getJid().asBareJid() + ": successfully enabled carbons");
features.carbonsEnabled = true; features.carbonsEnabled = true;
} }
// TODO if we didn’t enable stream managment in bind do it now sendPostBindInitialization(waitForDisco, carbonsEnabled != null);
// TODO if both are set mark account ready for pipelining
sendPostBindInitialization(streamManagementEnabled != null, carbonsEnabled != null);
} }
} }
this.quickStartInProgress = false; this.quickStartInProgress = false;