Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-23 02:10:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consolidate Notification Ids to a centralized constants class.

Browse Source
This commit is contained in:
Alex Hart
2020-01-07 10:51:44 -04:00
committed by Alan Evans
parent 72e10ac597
commit b10ce080a9
5 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/org/thoughtcrime/securesms/notifications/MessageNotifier.java
View File

@@ -95,8 +95,6 @@ public class MessageNotifier {
public static final String EXTRA_REMOTE_REPLY = "extra_remote_reply";
private static final String EMOJI_REPLACEMENT_STRING = "__EMOJI__";
private static final int SUMMARY_NOTIFICATION_ID = 1338;
private static final int PENDING_MESSAGES_ID = 1111;
private static final String NOTIFICATION_GROUP = "messages";
private static final long MIN_AUDIBLE_PERIOD_MILLIS = TimeUnit.SECONDS.toMillis(2);
private static final long DESKTOP_ACTIVITY_PERIOD = TimeUnit.MINUTES.toMillis(1);
@@ -135,11 +133,11 @@ public class MessageNotifier {
}
PendingMessageNotificationBuilder builder = new PendingMessageNotificationBuilder(context, TextSecurePreferences.getNotificationPrivacy(context));
ServiceUtil.getNotificationManager(context).notify(PENDING_MESSAGES_ID, builder.build());
ServiceUtil.getNotificationManager(context).notify(NotificationIds.PENDING_MESSAGES, builder.build());
}
public static void cancelMessagesPending(Context context) {
ServiceUtil.getNotificationManager(context).cancel(PENDING_MESSAGES_ID);
ServiceUtil.getNotificationManager(context).cancel(NotificationIds.PENDING_MESSAGES);
}
public static void cancelDelayedNotifications() {
@@ -148,7 +146,7 @@ public class MessageNotifier {
private static void cancelActiveNotifications(@NonNull Context context) {
NotificationManager notifications = ServiceUtil.getNotificationManager(context);
notifications.cancel(SUMMARY_NOTIFICATION_ID);
notifications.cancel(NotificationIds.MESSAGE_SUMMARY);
if (Build.VERSION.SDK_INT >= 23) {
try {
@@ -174,7 +172,7 @@ public class MessageNotifier {
StatusBarNotification[] activeNotifications = notificationManager.getActiveNotifications();
for (StatusBarNotification activeNotification : activeNotifications) {
if (activeNotification.getId() == SUMMARY_NOTIFICATION_ID) {
if (activeNotification.getId() == NotificationIds.MESSAGE_SUMMARY) {
return true;
}
}
@@ -200,14 +198,14 @@ public class MessageNotifier {
for (StatusBarNotification notification : activeNotifications) {
boolean validNotification = false;
if (notification.getId() != SUMMARY_NOTIFICATION_ID &&
if (notification.getId() != NotificationIds.MESSAGE_SUMMARY &&
notification.getId() != KeyCachingService.SERVICE_RUNNING_ID &&
notification.getId() != IncomingMessageObserver.FOREGROUND_ID &&
notification.getId() != PENDING_MESSAGES_ID &&
notification.getId() != NotificationIds.PENDING_MESSAGES &&
!CallNotificationBuilder.isWebRtcNotification(notification.getId()))
{
for (NotificationItem item : notificationState.getNotifications()) {
if (notification.getId() == (SUMMARY_NOTIFICATION_ID + item.getThreadId())) {
if (notification.getId() == NotificationIds.getNotificationIdForThread(item.getThreadId())) {
validNotification = true;
break;
}
@@ -352,9 +350,9 @@ public class MessageNotifier {
int notificationId;
if (Build.VERSION.SDK_INT >= 23) {
notificationId = (int) (SUMMARY_NOTIFICATION_ID + notifications.get(0).getThreadId());
notificationId = NotificationIds.getNotificationIdForThread(notifications.get(0).getThreadId());
} else {
notificationId = SUMMARY_NOTIFICATION_ID;
notificationId = NotificationIds.MESSAGE_SUMMARY;
}
builder.setThread(notifications.get(0).getRecipient());
@@ -426,7 +424,7 @@ public class MessageNotifier {
long timestamp = notifications.get(0).getTimestamp();
if (timestamp != 0) builder.setWhen(timestamp);
builder.addActions(notificationState.getMarkAsReadIntent(context, SUMMARY_NOTIFICATION_ID));
builder.addActions(notificationState.getMarkAsReadIntent(context, NotificationIds.MESSAGE_SUMMARY));
ListIterator<NotificationItem> iterator = notifications.listIterator(notifications.size());
@@ -442,7 +440,7 @@ public class MessageNotifier {
}
Notification notification = builder.build();
NotificationManagerCompat.from(context).notify(SUMMARY_NOTIFICATION_ID, builder.build());
NotificationManagerCompat.from(context).notify(NotificationIds.MESSAGE_SUMMARY, builder.build());
Log.i(TAG, "Posted notification. " + notification.toString());
}

19
app/src/main/java/org/thoughtcrime/securesms/notifications/NotificationIds.java Normal file
View File

@@ -0,0 +1,19 @@
package org.thoughtcrime.securesms.notifications;
public final class NotificationIds {
public static final int FCM_FAILURE = 12;
public static final int PENDING_MESSAGES = 1111;
public static final int MESSAGE_SUMMARY = 1338;
public static final int EXPERIENCE_UPGRADE = 1339;
public static final int APPLICATION_MIGRATION = 4242;
public static final int SMS_IMPORT_COMPLETE = 31337;
public static final int THREAD = 50000;
private NotificationIds() { }
public static int getNotificationIdForThread(long threadId) {
return THREAD + (int) threadId;
}
}