narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 1 Pull requests 1 Actions Packages Projects Releases 6 Wiki Activity

do not terminate jingle ft session twice (after iq timeout)

Browse source
This commit is contained in:
Daniel Gultsch 2024-03-03 20:14:27 +01:00
parent 00f52226d8
commit b9a19dc6c7
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleFileTransferConnection.java
View file

@ -843,6 +843,8 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
if (transport == null) { if (transport == null) {
return; return;
} }
// TODO consider setting transport callback to null. requires transport to handle null callback
//transport.setTransportCallback(null);
transport.terminate(); transport.terminate();
this.transport = null; this.transport = null;
} }
@ -980,7 +982,10 @@ public class JingleFileTransferConnection extends AbstractJingleConnection
public void onTransportSetupFailed() { public void onTransportSetupFailed() {
final var transport = this.transport; final var transport = this.transport;
if (transport == null) { if (transport == null) {
// this really is not supposed to happen // this can happen on IQ timeouts
if (isTerminated()) {
return;
}
sendSessionTerminate(Reason.FAILED_APPLICATION, null); sendSessionTerminate(Reason.FAILED_APPLICATION, null);
return; return;
} }