From 010b341251788f63c95eb6b9d58312e55dc66137 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Tue, 21 Mar 2017 18:08:20 +0100
Subject: [PATCH] do not pipeline first SM request because that might fail when
 resume fails

---
 src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 0052b3ab6..46fe15fc3 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -581,6 +581,7 @@ public class XmppConnection implements Runnable {
 				final RequestPacket r = new RequestPacket(smVersion);
 				tagWriter.writeStanzaAsync(r);
 			} else if (nextTag.isStart("resumed")) {
+				this.tagWriter.writeStanzaAsync(new RequestPacket(smVersion));
 				lastPacketReceived = SystemClock.elapsedRealtime();
 				final Element resumed = tagReader.readElement(nextTag);
 				final String h = resumed.getAttribute("h");
@@ -860,7 +861,6 @@ public class XmppConnection implements Runnable {
 			this.mSmCatchupMessageCounter.set(0);
 			this.mWaitingForSmCatchup.set(true);
 			this.tagWriter.writeStanzaAsync(resume);
-			this.tagWriter.writeStanzaAsync(new RequestPacket(smVersion));
 		} else if (needsBinding) {
 			if (this.streamFeatures.hasChild("bind")) {
 				sendBindRequest();