From c6db651322cf069c7ea845112c140592203bb72f Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Fri, 10 Apr 2020 21:33:08 +0200
Subject: [PATCH] allow all jingle states to transition into terminated

---
 .../xmpp/jingle/JingleRtpConnection.java         | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
index d03505fd8..e184fb8c8 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java
@@ -60,21 +60,25 @@ public class JingleRtpConnection extends AbstractJingleConnection implements Web
         ));
         transitionBuilder.put(State.SESSION_INITIALIZED, ImmutableList.of(
                 State.SESSION_ACCEPTED,
-                State.TERMINATED_CANCEL_OR_TIMEOUT,
+                State.TERMINATED_SUCCESS,
                 State.TERMINATED_DECLINED_OR_BUSY,
-                State.TERMINATED_APPLICATION_FAILURE,
-                State.TERMINATED_CONNECTIVITY_ERROR //at this state used for IQ errors and IQ timeouts
+                State.TERMINATED_CONNECTIVITY_ERROR,  //at this state used for IQ errors and IQ timeouts
+                State.TERMINATED_CANCEL_OR_TIMEOUT,
+                State.TERMINATED_APPLICATION_FAILURE
         ));
         transitionBuilder.put(State.SESSION_INITIALIZED_PRE_APPROVED, ImmutableList.of(
                 State.SESSION_ACCEPTED,
-                State.TERMINATED_CANCEL_OR_TIMEOUT,
+                State.TERMINATED_SUCCESS,
                 State.TERMINATED_DECLINED_OR_BUSY,
-                State.TERMINATED_APPLICATION_FAILURE,
-                State.TERMINATED_CONNECTIVITY_ERROR //at this state used for IQ errors and IQ timeouts
+                State.TERMINATED_CONNECTIVITY_ERROR,  //at this state used for IQ errors and IQ timeouts
+                State.TERMINATED_CANCEL_OR_TIMEOUT,
+                State.TERMINATED_APPLICATION_FAILURE
         ));
         transitionBuilder.put(State.SESSION_ACCEPTED, ImmutableList.of(
                 State.TERMINATED_SUCCESS,
+                State.TERMINATED_DECLINED_OR_BUSY,
                 State.TERMINATED_CONNECTIVITY_ERROR,
+                State.TERMINATED_CANCEL_OR_TIMEOUT,
                 State.TERMINATED_APPLICATION_FAILURE
         ));
         VALID_TRANSITIONS = transitionBuilder.build();