narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

do not nofiy UI if UI triggered retract

Browse source
This commit is contained in:
Daniel Gultsch 2024-01-20 11:41:37 +01:00
parent 5158fc4530
commit bff1ac5ebc
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
1 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java
View file

@ -659,12 +659,17 @@ public class JingleConnectionManager extends AbstractConnectionManager {
} }
} }
if (matchingProposal != null) { if (matchingProposal != null) {
retractSessionProposal(matchingProposal); retractSessionProposal(matchingProposal, false);
} }
} }
} }
private void retractSessionProposal(final RtpSessionProposal rtpSessionProposal) { private void retractSessionProposal(final RtpSessionProposal rtpSessionProposal) {
retractSessionProposal(rtpSessionProposal, true);
}
private void retractSessionProposal(
final RtpSessionProposal rtpSessionProposal, final boolean refresh) {
final Account account = rtpSessionProposal.account; final Account account = rtpSessionProposal.account;
Log.d( Log.d(
Config.LOGTAG, Config.LOGTAG,
@ -673,11 +678,13 @@ public class JingleConnectionManager extends AbstractConnectionManager {
+ rtpSessionProposal.with); + rtpSessionProposal.with);
this.rtpSessionProposals.remove(rtpSessionProposal); this.rtpSessionProposals.remove(rtpSessionProposal);
rtpSessionProposal.callIntegration.retracted(); rtpSessionProposal.callIntegration.retracted();
if (refresh) {
mXmppConnectionService.notifyJingleRtpConnectionUpdate( mXmppConnectionService.notifyJingleRtpConnectionUpdate(
account, account,
rtpSessionProposal.with, rtpSessionProposal.with,
rtpSessionProposal.sessionId, rtpSessionProposal.sessionId,
RtpEndUserState.RETRACTED); RtpEndUserState.RETRACTED);
}
final MessagePacket messagePacket = final MessagePacket messagePacket =
mXmppConnectionService.getMessageGenerator().sessionRetract(rtpSessionProposal); mXmppConnectionService.getMessageGenerator().sessionRetract(rtpSessionProposal);
writeLogMissedOutgoing( writeLogMissedOutgoing(