empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Add new call notification strings.

Browse source
This commit is contained in:
Alex Hart 2023-06-14 16:06:39 -03:00 • committed by Cody Henthorne
parent 6cd59daf0a
commit b1680ba5c6
2 changed files with 37 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/org/thoughtcrime/securesms/webrtc/CallNotificationBuilder.java
View file

@ -70,7 +70,7 @@ public class CallNotificationBuilder {
builder.setContentIntent(null); builder.setContentIntent(null);
return Single.just(builder.build()); return Single.just(builder.build());
} else if (type == TYPE_INCOMING_RINGING) { } else if (type == TYPE_INCOMING_RINGING) {
builder.setContentText(context.getString(recipient.isGroup() ? R.string.NotificationBarManager__incoming_signal_group_call : R.string.NotificationBarManager__incoming_signal_call)); builder.setContentText(getIncomingCallContentText(context, recipient, isVideoCall));
builder.setPriority(NotificationCompat.PRIORITY_HIGH); builder.setPriority(NotificationCompat.PRIORITY_HIGH);
builder.setCategory(NotificationCompat.CATEGORY_CALL); builder.setCategory(NotificationCompat.CATEGORY_CALL);
builder.setFullScreenIntent(pendingIntent, true); builder.setFullScreenIntent(pendingIntent, true);
@ -96,7 +96,7 @@ public class CallNotificationBuilder {
builder.addAction(getServiceNotificationAction(context, WebRtcCallService.hangupIntent(context), R.drawable.ic_call_end_grey600_32dp, R.string.NotificationBarManager__cancel_call)); builder.addAction(getServiceNotificationAction(context, WebRtcCallService.hangupIntent(context), R.drawable.ic_call_end_grey600_32dp, R.string.NotificationBarManager__cancel_call));
return Single.just(builder.build()); return Single.just(builder.build());
} else { } else {
builder.setContentText(context.getString(R.string.NotificationBarManager_signal_call_in_progress)); builder.setContentText(getOngoingCallContentText(context, recipient, isVideoCall));
builder.setOnlyAlertOnce(true); builder.setOnlyAlertOnce(true);
builder.setPriority(NotificationCompat.PRIORITY_DEFAULT); builder.setPriority(NotificationCompat.PRIORITY_DEFAULT);
builder.setCategory(NotificationCompat.CATEGORY_CALL); builder.setCategory(NotificationCompat.CATEGORY_CALL);
@ -158,8 +158,28 @@ public class CallNotificationBuilder {
return notificationId == WEBRTC_NOTIFICATION || notificationId == WEBRTC_NOTIFICATION_RINGING; return notificationId == WEBRTC_NOTIFICATION || notificationId == WEBRTC_NOTIFICATION_RINGING;
} }
private static @NonNull String getIncomingCallContentText(@NonNull Context context, @NonNull Recipient recipient, boolean isVideoCall) {
if (recipient.isGroup()) {
return context.getString(R.string.CallNotificationBuilder__incoming_signal_group_call);
} else if (isVideoCall) {
return context.getString(R.string.CallNotificationBuilder__incoming_signal_video_call);
} else {
return context.getString(R.string.CallNotificationBuilder__incoming_signal_voice_call);
}
}
private static @NonNull String getOngoingCallContentText(@NonNull Context context, @NonNull Recipient recipient, boolean isVideoCall) {
if (recipient.isGroup()) {
return context.getString(R.string.CallNotificationBuilder__ongoing_signal_group_call);
} else if (isVideoCall) {
return context.getString(R.string.CallNotificationBuilder__ongoing_signal_video_call);
} else {
return context.getString(R.string.CallNotificationBuilder__ongoing_signal_voice_call);
}
}
private static @NonNull String getNotificationChannel(int type) { private static @NonNull String getNotificationChannel(int type) {
if ((deviceVersionSupportsIncomingCallStyle() && type == TYPE_INCOMING_RINGING) || type == TYPE_ESTABLISHED) { if (type == TYPE_INCOMING_RINGING) {
return NotificationChannels.getInstance().CALLS; return NotificationChannels.getInstance().CALLS;
} else { } else {
return NotificationChannels.getInstance().CALL_STATUS; return NotificationChannels.getInstance().CALL_STATUS;

17
app/src/main/res/values/strings.xml
View file

@ -1217,10 +1217,7 @@
<string name="MessageQuotesBottomSheet_replies">Replies</string> <string name="MessageQuotesBottomSheet_replies">Replies</string>
<!-- NotificationBarManager --> <!-- NotificationBarManager -->
<string name="NotificationBarManager_signal_call_in_progress">Signal call in progress</string>
<string name="NotificationBarManager__establishing_signal_call">Establishing Signal call</string> <string name="NotificationBarManager__establishing_signal_call">Establishing Signal call</string>
<string name="NotificationBarManager__incoming_signal_call">Incoming Signal call</string>
<string name="NotificationBarManager__incoming_signal_group_call">Incoming Signal group call</string>
<!-- Temporary notification shown when starting the calling service --> <!-- Temporary notification shown when starting the calling service -->
<string name="NotificationBarManager__starting_signal_call_service">Starting Signal call service</string> <string name="NotificationBarManager__starting_signal_call_service">Starting Signal call service</string>
<string name="NotificationBarManager__stopping_signal_call_service">Stopping Signal call service</string> <string name="NotificationBarManager__stopping_signal_call_service">Stopping Signal call service</string>
@ -3551,6 +3548,20 @@
<string name="KbsMegaphone__pins_keep_information_thats_stored_with_signal_encrytped">PINs keep information that’s stored with Signal encrypted.</string> <string name="KbsMegaphone__pins_keep_information_thats_stored_with_signal_encrytped">PINs keep information that’s stored with Signal encrypted.</string>
<string name="KbsMegaphone__create_pin">Create PIN</string> <string name="KbsMegaphone__create_pin">Create PIN</string>
<!-- CallNotificationBuilder -->
<!-- Displayed in a notification when a Signal voice call is ringing -->
<string name="CallNotificationBuilder__incoming_signal_voice_call">Incoming Signal voice call</string>
<!-- Displayed in a notification when a Signal video call is ringing -->
<string name="CallNotificationBuilder__incoming_signal_video_call">Incoming Signal video call</string>
<!-- Displayed in a notification when a Signal group call is ringing -->
<string name="CallNotificationBuilder__incoming_signal_group_call">Incoming Signal group call</string>
<!-- Displayed in a notification when a Signal voice call is in progress -->
<string name="CallNotificationBuilder__ongoing_signal_voice_call">Ongoing Signal voice call</string>
<!-- Displayed in a notification when a Signal video call is in progress -->
<string name="CallNotificationBuilder__ongoing_signal_video_call">Ongoing Signal video call</string>
<!-- Displayed in a notification when a Signal group call is in progress -->
<string name="CallNotificationBuilder__ongoing_signal_group_call">Ongoing Signal group call</string>
<!-- transport_selection_list_item --> <!-- transport_selection_list_item -->
<string name="transport_selection_list_item__transport_icon">Transport icon</string> <string name="transport_selection_list_item__transport_icon">Transport icon</string>
<string name="ConversationListFragment_loading">Loading…</string> <string name="ConversationListFragment_loading">Loading…</string>