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

do not pipeline first SM request because that might fail when resume fails

Browse source
This commit is contained in:
Daniel Gultsch 2017-03-21 18:08:20 +01:00
parent c97c5def2c
commit 010b341251
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -581,6 +581,7 @@ public class XmppConnection implements Runnable {
final RequestPacket r = new RequestPacket(smVersion); final RequestPacket r = new RequestPacket(smVersion);
tagWriter.writeStanzaAsync(r); tagWriter.writeStanzaAsync(r);
} else if (nextTag.isStart("resumed")) { } else if (nextTag.isStart("resumed")) {
this.tagWriter.writeStanzaAsync(new RequestPacket(smVersion));
lastPacketReceived = SystemClock.elapsedRealtime(); lastPacketReceived = SystemClock.elapsedRealtime();
final Element resumed = tagReader.readElement(nextTag); final Element resumed = tagReader.readElement(nextTag);
final String h = resumed.getAttribute("h"); final String h = resumed.getAttribute("h");
@ -860,7 +861,6 @@ public class XmppConnection implements Runnable {
this.mSmCatchupMessageCounter.set(0); this.mSmCatchupMessageCounter.set(0);
this.mWaitingForSmCatchup.set(true); this.mWaitingForSmCatchup.set(true);
this.tagWriter.writeStanzaAsync(resume); this.tagWriter.writeStanzaAsync(resume);
this.tagWriter.writeStanzaAsync(new RequestPacket(smVersion));
} else if (needsBinding) { } else if (needsBinding) {
if (this.streamFeatures.hasChild("bind")) { if (this.streamFeatures.hasChild("bind")) {
sendBindRequest(); sendBindRequest();