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

wait for session iq to return sucessfully before sending other stanzas. fixed #1017

Browse source
This commit is contained in:
iNPUTmice 2015-03-20 21:48:45 +01:00
parent 5793fb680f
commit da099e5fa4
1 changed files with 42 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -687,28 +687,11 @@ public class XmppConnection implements Runnable {
} catch (final InvalidJidException e) { } catch (final InvalidJidException e) {
// TODO: Handle the case where an external JID is technically invalid? // TODO: Handle the case where an external JID is technically invalid?
} }
if (streamFeatures.hasChild("sm", "urn:xmpp:sm:3")) { if (streamFeatures.hasChild("session")) {
smVersion = 3; sendStartSession();
final EnablePacket enable = new EnablePacket(smVersion); } else {
tagWriter.writeStanzaAsync(enable); sendPostBindInitialization();
stanzasSent = 0;
messageReceipts.clear();
} else if (streamFeatures.hasChild("sm", "urn:xmpp:sm:2")) {
smVersion = 2;
final EnablePacket enable = new EnablePacket(smVersion);
tagWriter.writeStanzaAsync(enable);
stanzasSent = 0;
messageReceipts.clear();
} }
features.carbonsEnabled = false;
features.blockListRequested = false;
disco.clear();
sendServiceDiscoveryInfo(account.getServer());
sendServiceDiscoveryItems(account.getServer());
if (bindListener != null) {
bindListener.onBind(account);
}
sendInitialPing();
} else { } else {
disconnect(true); disconnect(true);
} }
@ -717,12 +700,45 @@ public class XmppConnection implements Runnable {
} }
} }
}); });
if (this.streamFeatures.hasChild("session")) { }
Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": sending deprecated session");
final IqPacket startSession = new IqPacket(IqPacket.TYPE.SET); private void sendStartSession() {
startSession.addChild("session","urn:ietf:params:xml:ns:xmpp-session"); final IqPacket startSession = new IqPacket(IqPacket.TYPE.SET);
this.sendUnmodifiedIqPacket(startSession, null); startSession.addChild("session","urn:ietf:params:xml:ns:xmpp-session");
this.sendUnmodifiedIqPacket(startSession, new OnIqPacketReceived() {
@Override
public void onIqPacketReceived(Account account, IqPacket packet) {
if (packet.getType() == IqPacket.TYPE.RESULT) {
sendPostBindInitialization();
} else {
disconnect(true);
}
}
});
}
private void sendPostBindInitialization() {
smVersion = 0;
if (streamFeatures.hasChild("sm", "urn:xmpp:sm:3")) {
smVersion = 3;
} else if (streamFeatures.hasChild("sm", "urn:xmpp:sm:2")) {
smVersion = 2;
} }
if (smVersion != 0) {
final EnablePacket enable = new EnablePacket(smVersion);
tagWriter.writeStanzaAsync(enable);
stanzasSent = 0;
messageReceipts.clear();
}
features.carbonsEnabled = false;
features.blockListRequested = false;
disco.clear();
sendServiceDiscoveryInfo(account.getServer());
sendServiceDiscoveryItems(account.getServer());
if (bindListener != null) {
bindListener.onBind(account);
}
sendInitialPing();
} }
private void sendServiceDiscoveryInfo(final Jid server) { private void sendServiceDiscoveryInfo(final Jid server) {