sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow jingle state transition for fallback after proxy failure

This commit is contained in:
Daniel Gultsch 2019-11-09 09:31:35 +01:00
parent a651703a9e
commit f6724e405e
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
View File

@ -922,11 +922,13 @@ public class JingleConnection implements Transferable {
respondToIqWithOutOfOrder(packet); respondToIqWithOutOfOrder(packet);
return; 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"); Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": received out of order transport-replace");
respondToIqWithOutOfOrder(packet); respondToIqWithOutOfOrder(packet);
return; 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"); Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": receiving fallback to ibb");
final String receivedBlockSize = packet.getJingleContent().ibbTransport().getAttribute("block-size"); final String receivedBlockSize = packet.getJingleContent().ibbTransport().getAttribute("block-size");
if (receivedBlockSize != null) { if (receivedBlockSize != null) {
@ -970,11 +972,13 @@ public class JingleConnection implements Transferable {
respondToIqWithOutOfOrder(packet); respondToIqWithOutOfOrder(packet);
return; 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"); Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": received out of order transport-accept");
respondToIqWithOutOfOrder(packet); respondToIqWithOutOfOrder(packet);
return; return;
} }
this.proxyActivationFailed = false; //fallback accepted; now we no longer need to accept another one;
if (packet.getJingleContent().hasIbbTransport()) { if (packet.getJingleContent().hasIbbTransport()) {
final Element ibbTransport = packet.getJingleContent().ibbTransport(); final Element ibbTransport = packet.getJingleContent().ibbTransport();
final String receivedBlockSize = ibbTransport.getAttribute("block-size"); final String receivedBlockSize = ibbTransport.getAttribute("block-size");