From c416948f8bf188e1ff6369d5a5dbd7c1679976ee Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 29 Jan 2016 12:09:55 +0100
Subject: [PATCH] be more careful with resetting the stream id

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

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index a39ccc37b..37b2da685 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -549,7 +549,7 @@ public class XmppConnection implements Runnable {
 			} else if (nextTag.isStart("failed")) {
 				tagReader.readElement(nextTag);
 				Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": resumption failed");
-				streamId = null;
+				resetStreamId();
 				if (account.getStatus() != Account.State.ONLINE) {
 					sendBindRequest();
 				}
@@ -1290,7 +1290,6 @@ public class XmppConnection implements Runnable {
 			}
 			return;
 		} else {
-			resetStreamId();
 			if (tagWriter.isActive()) {
 				tagWriter.finish();
 				try {