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

add safeguards to ringtone playing twice

Browse source
This commit is contained in:
Daniel Gultsch 2024-03-25 08:50:44 +01:00
parent e7edc2ce82
commit 21732237d4
No known key found for this signature in database
GPG key ID: F43D18AD2A0982C2
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/main/java/eu/siacs/conversations/services/NotificationService.java
View file

@ -502,11 +502,9 @@ public class NotificationService {
public synchronized void startRinging(
final AbstractJingleConnection.Id id, final Set<Media> media) {
showIncomingCallNotification(id, media);
final NotificationManager notificationManager =
(NotificationManager)
mXmppConnectionService.getSystemService(Context.NOTIFICATION_SERVICE);
final NotificationManager notificationManager = mXmppConnectionService.getSystemService(NotificationManager.class);
final int currentInterruptionFilter;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && notificationManager != null) {
if (notificationManager != null) {
currentInterruptionFilter = notificationManager.getCurrentInterruptionFilter();
} else {
currentInterruptionFilter = 1; // INTERRUPTION_FILTER_ALL
@ -525,6 +523,10 @@ public class NotificationService {
if (currentVibrationFuture != null) {
currentVibrationFuture.cancel(true);
}
final var preexistingRingtone = this.currentlyPlayingRingtone;
if (preexistingRingtone != null) {
preexistingRingtone.stop();
}
final SharedPreferences preferences =
PreferenceManager.getDefaultSharedPreferences(mXmppConnectionService);
final Resources resources = mXmppConnectionService.getResources();

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

@ -504,6 +504,7 @@ 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) {
proposal.callIntegration.busy();
writeLogMissedOutgoing(
@ -763,6 +764,7 @@ public class JingleConnectionManager extends AbstractConnectionManager {
final RtpSessionProposal proposal =
RtpSessionProposal.of(account, with.asBareJid(), media, callIntegration);
callIntegration.setCallback(new ProposalStateCallback(proposal));
// TODO ensure that there is no previous proposal?!
this.rtpSessionProposals.put(proposal, DeviceDiscoveryState.SEARCHING);
mXmppConnectionService.notifyJingleRtpConnectionUpdate(
account, proposal.with, proposal.sessionId, RtpEndUserState.FINDING_DEVICE);

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

@ -2691,6 +2691,15 @@ public class JingleRtpConnection extends AbstractJingleConnection
@Override
public void onCallIntegrationShowIncomingCallUi() {
if (isTerminated()) {
// there might be race conditions with the call integration service invoking this
// callback when the rtp session has already ended. It should be enough to just return
// instead of throwing an exception. however throwing an exception gives us a sense of
// if and how frequently this happens
throw new IllegalStateException(
"CallIntegration requested incoming call UI but session was already terminated");
}
// TODO apparently this can be called too early as well?
xmppConnectionService.getNotificationService().startRinging(id, getMedia());
}