From 87aeaad3c0aa66f9a7604806aa1a8c07cab2a6f6 Mon Sep 17 00:00:00 2001 From: Daniel Gultsch <daniel@gultsch.de> Date: Mon, 25 Mar 2024 10:58:20 +0100 Subject: [PATCH] minor safeguard to ensure call integration ends (cherry picked from commit f18ec53233b52240520bb88d186a8cbe9b6daedc) --- .../conversations/xmpp/jingle/JingleConnectionManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java index f95542c08..ffd38e277 100644 --- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java +++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java @@ -498,8 +498,8 @@ public class JingleConnectionManager extends AbstractConnectionManager { final RtpSessionProposal proposal = getRtpSessionProposal(account, from.asBareJid(), sessionId); synchronized (rtpSessionProposals) { - // TODO remove the remove()!= null check to ensure we always call busy() - if (proposal != null && rtpSessionProposals.remove(proposal) != null) { + if (proposal != null) { + rtpSessionProposals.remove(proposal); proposal.callIntegration.busy(); writeLogMissedOutgoing( account, proposal.with, proposal.sessionId, serverMsgId, timestamp);