Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 04:58:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash after hanging up call.

Browse Source
This commit is contained in:
Cody Henthorne
2023-06-26 12:29:43 -04:00
committed by Nicholas
parent 6c95b766d6
commit dd40517f12
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/thoughtcrime/securesms/service/webrtc/WebRtcCallService.java
View File

@@ -77,6 +77,7 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
private Notification lastNotification;
private boolean isGroup = true;
private Disposable notificationDisposable = Disposable.empty();
private boolean stopping = false;
public static void update(@NonNull Context context, int type, @NonNull RecipientId recipientId, boolean isVideoCall) {
Intent intent = new Intent(context, WebRtcCallService.class);
@@ -243,6 +244,7 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
notificationDisposable.dispose();
notificationDisposable = CallNotificationBuilder.getCallInProgressNotification(this, type, Recipient.resolved(id), isVideoCall)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(notification -> {
lastNotificationId = CallNotificationBuilder.getNotificationId(type);
lastNotification = notification;
@@ -251,7 +253,11 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
});
}
private void startForegroundCompat(int notificationId, Notification notification) {
private synchronized void startForegroundCompat(int notificationId, Notification notification) {
if (stopping) {
return;
}
if (Build.VERSION.SDK_INT >= 30) {
startForeground(notificationId, notification, ServiceInfo.FOREGROUND_SERVICE_TYPE_CAMERA | ServiceInfo.FOREGROUND_SERVICE_TYPE_MICROPHONE);
} else {
@@ -259,7 +265,8 @@ public final class WebRtcCallService extends Service implements SignalAudioManag
}
}
private void stop() {
private synchronized void stop() {
stopping = true;
notificationDisposable.dispose();
stopForeground(true);
stopSelf();