mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-20 08:39:22 +01:00
Use calling service type for calls.
This commit is contained in:
committed by
Greyson Parrelli
parent
10d394f39e
commit
39b4484887
@@ -18,7 +18,7 @@ import org.thoughtcrime.securesms.R;
|
||||
import org.thoughtcrime.securesms.components.webrtc.v2.CallIntent;
|
||||
import org.thoughtcrime.securesms.notifications.NotificationChannels;
|
||||
import org.thoughtcrime.securesms.recipients.Recipient;
|
||||
import org.thoughtcrime.securesms.service.webrtc.WebRtcCallService;
|
||||
import org.thoughtcrime.securesms.service.webrtc.ActiveCallManager;
|
||||
import org.thoughtcrime.securesms.util.ConversationUtil;
|
||||
|
||||
/**
|
||||
@@ -113,7 +113,7 @@ public class CallNotificationBuilder {
|
||||
if (deviceVersionSupportsIncomingCallStyle()) {
|
||||
builder.setStyle(NotificationCompat.CallStyle.forIncomingCall(
|
||||
person,
|
||||
WebRtcCallService.denyCallIntent(context),
|
||||
ActiveCallManager.denyCallIntent(context),
|
||||
getActivityPendingIntent(context, isVideoCall ? LaunchCallScreenIntentState.VIDEO : LaunchCallScreenIntentState.AUDIO)
|
||||
).setIsVideo(isVideoCall));
|
||||
}
|
||||
@@ -121,7 +121,7 @@ public class CallNotificationBuilder {
|
||||
return builder.build();
|
||||
} else if (type == TYPE_OUTGOING_RINGING) {
|
||||
builder.setContentText(context.getString(R.string.NotificationBarManager__establishing_signal_call));
|
||||
builder.addAction(getServiceNotificationAction(context, WebRtcCallService.hangupIntent(context), R.drawable.symbol_phone_down_fill_24, R.string.NotificationBarManager__cancel_call));
|
||||
builder.addAction(getServiceNotificationAction(context, ActiveCallManager.hangupIntent(context), R.drawable.symbol_phone_down_fill_24, R.string.NotificationBarManager__cancel_call));
|
||||
return builder.build();
|
||||
} else {
|
||||
builder.setContentText(getOngoingCallContentText(context, recipient, isVideoCall));
|
||||
@@ -137,7 +137,7 @@ public class CallNotificationBuilder {
|
||||
if (deviceVersionSupportsIncomingCallStyle()) {
|
||||
builder.setStyle(NotificationCompat.CallStyle.forOngoingCall(
|
||||
person,
|
||||
WebRtcCallService.hangupIntent(context)
|
||||
ActiveCallManager.hangupIntent(context)
|
||||
).setIsVideo(isVideoCall));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user