Page MenuHomePhabricator
Files F3294864

D8730.id31263.diff
No OneTemporary
Actions

D8730.id31263.diff
View Options

diff --git a/native/android/app/src/main/java/app/comm/android/notifications/CommNotificationsHandler.java b/native/android/app/src/main/java/app/comm/android/notifications/CommNotificationsHandler.java
--- a/native/android/app/src/main/java/app/comm/android/notifications/CommNotificationsHandler.java
+++ b/native/android/app/src/main/java/app/comm/android/notifications/CommNotificationsHandler.java
@@ -23,10 +23,14 @@
import app.comm.android.fbjni.MessageOperationsUtilities;
import app.comm.android.fbjni.NetworkModule;
import app.comm.android.fbjni.NotificationsCryptoModule;
+import app.comm.android.fbjni.StaffUtils;
import app.comm.android.fbjni.ThreadOperations;
import com.google.firebase.messaging.FirebaseMessagingService;
import com.google.firebase.messaging.RemoteMessage;
import java.io.File;
+import java.lang.StringBuilder;
+import java.util.ArrayList;
+import java.util.Arrays;
import me.leolin.shortcutbadger.ShortcutBadger;
import org.json.JSONException;
import org.json.JSONObject;
@@ -39,7 +43,7 @@
private static final String NOTIF_ID_KEY = "id";
private static final String ENCRYPTED_PAYLOAD_KEY = "encryptedPayload";
private static final String ENCRYPTION_FAILED_KEY = "encryptionFailed";
-
+ private static final String GROUP_NOTIF_IDS_KEY = "groupNotifIDs";
private static final String CHANNEL_ID = "default";
private static final long[] VIBRATION_SPEC = {500, 500};
private Bitmap displayableNotificationLargeIcon;
@@ -188,12 +192,19 @@
boolean isGroupSummary =
(notification.getNotification().flags &
Notification.FLAG_GROUP_SUMMARY) == Notification.FLAG_GROUP_SUMMARY;
+
if (tag != null && tag.equals(rescindID)) {
notificationManager.cancel(notification.getTag(), notification.getId());
+ } else if (
+ isGroupMember && isGroupSummary && StaffUtils.isStaffRelease()) {
+ groupSummaryPresent = true;
+ removeNotificationFromGroupSummary(threadID, rescindID, notification);
} else if (isGroupMember && isGroupSummary) {
groupSummaryPresent = true;
} else if (isGroupMember) {
threadGroupPresent = true;
+ } else if (isGroupSummary && StaffUtils.isStaffRelease()) {
+ checkForUnmatchedRescind(threadID, rescindID, notification);
}
}
@@ -207,9 +218,8 @@
NotificationCompat.Builder notificationBuilder,
String threadID) {
- notificationBuilder =
- notificationBuilder.setGroup(threadID).setGroupAlertBehavior(
- NotificationCompat.GROUP_ALERT_CHILDREN);
+ notificationBuilder.setGroup(threadID).setGroupAlertBehavior(
+ NotificationCompat.GROUP_ALERT_CHILDREN);
NotificationCompat.Builder groupSummaryNotificationBuilder =
new NotificationCompat.Builder(this.getApplicationContext())
@@ -219,9 +229,28 @@
this.createStartMainActivityAction(threadID, threadID))
.setGroup(threadID)
.setGroupSummary(true)
- .setAutoCancel(true)
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN);
+ if (StaffUtils.isStaffRelease()) {
+ ArrayList<String> groupNotifIDs =
+ recordNotificationInGroupSummary(threadID, notificationID);
+
+ String notificationSummaryBody =
+ "Notif IDs: " + String.join(System.lineSeparator(), groupNotifIDs);
+
+ Bundle data = new Bundle();
+ data.putStringArrayList(GROUP_NOTIF_IDS_KEY, groupNotifIDs);
+
+ groupSummaryNotificationBuilder
+ .setContentTitle("Summary for thread id " + threadID)
+ .setExtras(data)
+ .setStyle(new NotificationCompat.BigTextStyle().bigText(
+ notificationSummaryBody))
+ .setAutoCancel(false);
+ } else {
+ groupSummaryNotificationBuilder.setAutoCancel(true);
+ }
+
notificationManager.notify(
notificationID, notificationID.hashCode(), notificationBuilder.build());
notificationManager.notify(
@@ -258,11 +287,11 @@
.setAutoCancel(true);
if (title != null) {
- notificationBuilder = notificationBuilder.setContentTitle(title);
+ notificationBuilder.setContentTitle(title);
}
if (threadID != null) {
- notificationBuilder = notificationBuilder.setContentIntent(
+ notificationBuilder.setContentIntent(
this.createStartMainActivityAction(id, threadID));
}
@@ -319,4 +348,140 @@
message.getData().forEach(bundle::putString);
return bundle;
}
+
+ private void displayErrorMessageNotification(
+ String errorMessage,
+ String errorTitle,
+ String largeErrorData) {
+
+ NotificationCompat.Builder errorNotificationBuilder =
+ new NotificationCompat.Builder(this.getApplicationContext())
+ .setDefaults(Notification.DEFAULT_ALL)
+ .setChannelId(CHANNEL_ID)
+ .setSmallIcon(R.drawable.notif_icon)
+ .setLargeIcon(displayableNotificationLargeIcon);
+
+ if (errorMessage != null) {
+ errorNotificationBuilder.setContentText(errorMessage);
+ }
+
+ if (errorTitle != null) {
+ errorNotificationBuilder.setContentTitle(errorTitle);
+ }
+
+ if (largeErrorData != null) {
+ errorNotificationBuilder.setStyle(
+ new NotificationCompat.BigTextStyle().bigText(largeErrorData));
+ }
+
+ notificationManager.notify(
+ errorMessage,
+ errorMessage.hashCode(),
+ errorNotificationBuilder.build());
+ }
+
+ private boolean
+ isGroupSummary(StatusBarNotification notification, String threadID) {
+ boolean isAnySummary = (notification.getNotification().flags &
+ Notification.FLAG_GROUP_SUMMARY) != 0;
+ if (threadID == null) {
+ return isAnySummary;
+ }
+ return isAnySummary &&
+ threadID.equals(notification.getNotification().getGroup());
+ }
+
+ private ArrayList<String>
+ recordNotificationInGroupSummary(String threadID, String notificationID) {
+ ArrayList<String> groupNotifIDs =
+ Arrays.stream(notificationManager.getActiveNotifications())
+ .filter(notif -> isGroupSummary(notif, threadID))
+ .findFirst()
+ .map(
+ notif
+ -> notif.getNotification().extras.getStringArrayList(
+ GROUP_NOTIF_IDS_KEY))
+ .orElse(new ArrayList<>());
+
+ groupNotifIDs.add(notificationID);
+ return groupNotifIDs;
+ }
+
+ private void removeNotificationFromGroupSummary(
+ String threadID,
+ String notificationID,
+ StatusBarNotification groupSummaryNotification) {
+ ArrayList<String> groupNotifIDs =
+ groupSummaryNotification.getNotification().extras.getStringArrayList(
+ GROUP_NOTIF_IDS_KEY);
+ if (groupNotifIDs == null) {
+ displayErrorMessageNotification(
+ "Empty summary notif for thread ID " + threadID,
+ "Empty Summary Notif",
+ "Summary notification for thread ID " + threadID +
+ " had empty body when rescinding " + notificationID);
+ }
+
+ boolean notificationRemoved =
+ groupNotifIDs.removeIf(notifID -> notifID.equals(notificationID));
+
+ if (!notificationRemoved) {
+ displayErrorMessageNotification(
+ "Notif with ID " + notificationID + " not in " + threadID,
+ "Unrecorded Notif",
+ "Rescinded notification with id " + notificationID +
+ " not found in group summary for thread id " + threadID);
+ return;
+ }
+
+ String notificationSummaryBody =
+ "Notif IDs: " + String.join(System.lineSeparator(), groupNotifIDs);
+
+ Bundle data = new Bundle();
+ data.putStringArrayList(GROUP_NOTIF_IDS_KEY, groupNotifIDs);
+
+ NotificationCompat.Builder groupSummaryNotificationBuilder =
+ new NotificationCompat.Builder(this.getApplicationContext())
+ .setChannelId(CHANNEL_ID)
+ .setSmallIcon(R.drawable.notif_icon)
+ .setContentIntent(
+ this.createStartMainActivityAction(threadID, threadID))
+ .setContentTitle("Summary for thread id " + threadID)
+ .setExtras(data)
+ .setStyle(new NotificationCompat.BigTextStyle().bigText(
+ notificationSummaryBody))
+ .setGroup(threadID)
+ .setGroupSummary(true)
+ .setAutoCancel(false)
+ .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN);
+
+ notificationManager.notify(
+ threadID, threadID.hashCode(), groupSummaryNotificationBuilder.build());
+ }
+
+ private void checkForUnmatchedRescind(
+ String threadID,
+ String notificationID,
+ StatusBarNotification anySummaryNotification) {
+ ArrayList<String> anyGroupNotifIDs =
+ anySummaryNotification.getNotification().extras.getStringArrayList(
+ GROUP_NOTIF_IDS_KEY);
+ if (anyGroupNotifIDs == null) {
+ return;
+ }
+
+ String groupID = anySummaryNotification.getNotification().getGroup();
+ for (String notifID : anyGroupNotifIDs) {
+ if (!notificationID.equals(notifID)) {
+ continue;
+ }
+
+ displayErrorMessageNotification(
+ "Summary for thread id " + groupID + "has " + notifID,
+ "Rescind Mismatch",
+ "Summary notif for thread id " + groupID + " contains notif id " +
+ notifID + " which was received in rescind with thread id " +
+ threadID);
+ }
+ }
}

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 17, 8:22 PM (20 h, 25 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2531655
Default Alt Text
D8730.id31263.diff (9 KB)

Event Timeline