send jmi finish alongside session terminate

Daniel Gultsch created 2 years ago

Change summary

src/main/java/eu/siacs/conversations/generator/MessageGenerator.java      |  1 
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java | 10 
2 files changed, 10 insertions(+), 1 deletion(-)

Detailed changes

src/main/java/eu/siacs/conversations/generator/MessageGenerator.java

@@ -234,7 +234,6 @@ public class MessageGenerator extends AbstractGenerator {
         final MessagePacket packet = new MessagePacket();
         packet.setType(MessagePacket.TYPE_CHAT);
         packet.setTo(with);
-        packet.setId(JingleRtpConnection.JINGLE_MESSAGE_PROPOSE_ID_PREFIX + sessionId);
         final Element finish = packet.addChild("finish", Namespace.JINGLE_MESSAGE);
         finish.setAttribute("id", sessionId);
         final Element reasonElement = finish.addChild("reason", Namespace.JINGLE);

src/main/java/eu/siacs/conversations/xmpp/jingle/JingleRtpConnection.java

@@ -1986,6 +1986,7 @@ public class JingleRtpConnection extends AbstractJingleConnection
 
     protected void sendSessionTerminate(final Reason reason, final String text) {
         sendSessionTerminate(reason, text, this::writeLogMessage);
+        sendJingleMessageFinish(reason);
     }
 
     private void sendTransportInfo(
@@ -2358,6 +2359,15 @@ public class JingleRtpConnection extends AbstractJingleConnection
         xmppConnectionService.sendMessagePacket(id.account, messagePacket);
     }
 
+    private void sendJingleMessageFinish(final Reason reason) {
+        final var account = id.getAccount();
+        final MessagePacket messagePacket =
+                xmppConnectionService
+                        .getMessageGenerator()
+                        .sessionFinish(id.with, id.sessionId, reason);
+        xmppConnectionService.sendMessagePacket(account, messagePacket);
+    }
+
     private boolean isOmemoEnabled() {
         final Conversational conversational = message.getConversation();
         if (conversational instanceof Conversation) {