Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 08:39:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Introduce ActiveCallManager to prevent android service crashes during call handling.

Browse Source
This commit is contained in:
Cody Henthorne
2024-01-23 10:34:34 -05:00
committed by Greyson Parrelli
parent ee19520e1b
commit 96823e944d
6 changed files with 443 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
View File

@@ -29,7 +29,7 @@ import org.thoughtcrime.securesms.util.ConversationUtil;
public class CallNotificationBuilder {
private static final int WEBRTC_NOTIFICATION = 313388;
public static final int WEBRTC_NOTIFICATION = 313388;
private static final int WEBRTC_NOTIFICATION_RINGING = 313389;
public static final int TYPE_INCOMING_RINGING = 1;
@@ -114,7 +114,7 @@ public class CallNotificationBuilder {
if (deviceVersionSupportsIncomingCallStyle()) {
builder.setStyle(NotificationCompat.CallStyle.forIncomingCall(
person,
getServicePendingIntent(context, WebRtcCallService.denyCallIntent(context)),
WebRtcCallService.denyCallIntent(context),
getActivityPendingIntent(context, isVideoCall ? LaunchCallScreenIntentState.VIDEO : LaunchCallScreenIntentState.AUDIO)
).setIsVideo(isVideoCall));
}
@@ -138,7 +138,7 @@ public class CallNotificationBuilder {
if (deviceVersionSupportsIncomingCallStyle()) {
builder.setStyle(NotificationCompat.CallStyle.forOngoingCall(
person,
getServicePendingIntent(context, WebRtcCallService.hangupIntent(context))
WebRtcCallService.hangupIntent(context)
).setIsVideo(isVideoCall));
}
@@ -214,13 +214,8 @@ public class CallNotificationBuilder {
}
}
private static PendingIntent getServicePendingIntent(@NonNull Context context, @NonNull Intent intent) {
return Build.VERSION.SDK_INT >= 26 ? PendingIntent.getForegroundService(context, 0, intent, PendingIntentFlags.mutable())
: PendingIntent.getService(context, 0, intent, PendingIntentFlags.mutable());
}
private static NotificationCompat.Action getServiceNotificationAction(Context context, Intent intent, int iconResId, int titleResId) {
return new NotificationCompat.Action(iconResId, context.getString(titleResId), getServicePendingIntent(context, intent));
private static NotificationCompat.Action getServiceNotificationAction(Context context, PendingIntent intent, int iconResId, int titleResId) {
return new NotificationCompat.Action(iconResId, context.getString(titleResId), intent);
}
private static PendingIntent getActivityPendingIntent(@NonNull Context context, @NonNull LaunchCallScreenIntentState launchCallScreenIntentState) {