check for h attribute in 'failed' nonza

1 files changed, 9 insertions, 3 deletions

diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 687b51d81..2bebeb4c7 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -550,12 +550,18 @@ public class XmppConnection implements Runnable {
 				try {
 					final int serverSequence = Integer.parseInt(ack.getAttribute("h"));
 					acknowledgeStanzaUpTo(serverSequence);
-				} catch (NumberFormatException e) {
+				} catch (NumberFormatException | NullPointerException e) {
 					Log.d(Config.LOGTAG,account.getJid().toBareJid()+": server send ack without sequence number");
 				}
 			} else if (nextTag.isStart("failed")) {
-				tagReader.readElement(nextTag);
-				Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": resumption failed");
+				Element failed = tagReader.readElement(nextTag);
+				try {
+					final int serverCount = Integer.parseInt(failed.getAttribute("h"));
+					Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": resumption failed but server acknowledged stanza #"+h);
+					acknowledgeStanzaUpTo(serverCount);
+				} catch (NumberFormatException | NullPointerException e) {
+					Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": resumption failed");
+				}
 				resetStreamId();
 				if (account.getStatus() != Account.State.ONLINE) {
 					sendBindRequest();