MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Align push notification types and delivery priorities

This commit is contained in:
Jon Chambers 2023-11-29 18:05:29 -05:00 committed by Jon Chambers
parent db17693ba7
commit 34a943832a
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
service/src/main/java/org/whispersystems/textsecuregcm/push/APNSender.java
View File

@ -113,21 +113,28 @@ public class APNSender implements Managed, PushNotificationSender {
.build(); .build();
}; };
final PushType pushType; final PushType pushType = switch (notification.notificationType()) {
case NOTIFICATION -> {
if (isVoip) { if (isVoip) {
pushType = PushType.VOIP; yield PushType.VOIP;
} else { } else {
pushType = notification.urgent() ? PushType.ALERT : PushType.BACKGROUND; yield notification.urgent() ? PushType.ALERT : PushType.BACKGROUND;
} }
}
final DeliveryPriority deliveryPriority = switch (notification.notificationType()) { case ATTEMPT_LOGIN_NOTIFICATION_HIGH_PRIORITY -> PushType.ALERT;
case NOTIFICATION -> case CHALLENGE, RATE_LIMIT_CHALLENGE -> PushType.BACKGROUND;
(notification.urgent() || isVoip) ? DeliveryPriority.IMMEDIATE : DeliveryPriority.CONSERVE_POWER;
case ATTEMPT_LOGIN_NOTIFICATION_HIGH_PRIORITY -> DeliveryPriority.IMMEDIATE;
case CHALLENGE, RATE_LIMIT_CHALLENGE -> DeliveryPriority.CONSERVE_POWER;
}; };
final DeliveryPriority deliveryPriority;
if (pushType == PushType.BACKGROUND) {
deliveryPriority = DeliveryPriority.CONSERVE_POWER;
} else {
deliveryPriority = (notification.urgent() || isVoip)
? DeliveryPriority.IMMEDIATE
: DeliveryPriority.CONSERVE_POWER;
}
final String collapseId = final String collapseId =
(notification.notificationType() == PushNotification.NotificationType.NOTIFICATION && notification.urgent() && !isVoip) (notification.notificationType() == PushNotification.NotificationType.NOTIFICATION && notification.urgent() && !isVoip)
? "incoming-message" : null; ? "incoming-message" : null;