allow jingle state transition for fallback after proxy failure

1 files changed, 6 insertions, 2 deletions

diff --git a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
index 9ac39ed5c..5ea81b10f 100644
--- a/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/de/pixart/messenger/xmpp/jingle/JingleConnection.java
@@ -940,11 +940,13 @@ public class JingleConnection implements Transferable {
             respondToIqWithOutOfOrder(packet);
             return;
         }
-        if (mJingleStatus != JINGLE_STATUS_ACCEPTED && !proxyActivationFailed) {
+        final boolean validState = mJingleStatus == JINGLE_STATUS_ACCEPTED || (proxyActivationFailed && mJingleStatus == JINGLE_STATUS_TRANSMITTING);
+        if (!validState) {
             Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": received out of order transport-replace");
             respondToIqWithOutOfOrder(packet);
             return;
         }
+        this.proxyActivationFailed = false; //fallback received; now we no longer need to accept another one;
         Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": receiving fallback to ibb");
         final String receivedBlockSize = packet.getJingleContent().ibbTransport().getAttribute("block-size");
         if (receivedBlockSize != null) {
@@ -988,11 +990,13 @@ public class JingleConnection implements Transferable {
             respondToIqWithOutOfOrder(packet);
             return;
         }
-        if (this.mJingleStatus != JINGLE_STATUS_ACCEPTED) {
+        final boolean validState = mJingleStatus == JINGLE_STATUS_ACCEPTED || (proxyActivationFailed && mJingleStatus == JINGLE_STATUS_TRANSMITTING);
+        if (!validState) {
             Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": received out of order transport-accept");
             respondToIqWithOutOfOrder(packet);
             return;
         }
+        this.proxyActivationFailed = false; //fallback accepted; now we no longer need to accept another one;
         if (packet.getJingleContent().hasIbbTransport()) {
             final Element ibbTransport = packet.getJingleContent().ibbTransport();
             final String receivedBlockSize = ibbTransport.getAttribute("block-size");