Page MenuHomePhabricator
Differential D3915

[web,native,lib] [refactor] [ENG-530] rename hook to useInlineEngagement from useInlineText
AbandonedPublic
Actions

Authored by • benschac on May 4 2022, 9:00 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 19, 7:16 PM
Unknown Object (File)
Mon, Mar 10, 6:54 AM
Unknown Object (File)
Tue, Mar 4, 3:25 AM
Unknown Object (File)
Feb 13 2025, 1:27 PM
Unknown Object (File)
Feb 13 2025, 1:27 PM
Unknown Object (File)
Feb 13 2025, 1:19 PM
Unknown Object (File)
Feb 6 2025, 10:57 PM
Unknown Object (File)
Jan 30 2025, 12:18 PM
View All Files
Subscribers
• abosh
• adrian
• karol
tomek

Details

Reviewers
ashoat
atul
Summary

from diff https://phabricator.ashoat.com/D3895 suggestion was made > In a later diff it would probably be good to rename InlineSidebar to InlineFeedback, InlineReactions, InlineResponses, or InlineEngagement or something. Requesting ashoat since he made the request.

Test Plan

feature still works as expected, naming of hook changed consistently across the codebase.

Diff Detail

Repository
rCOMM Comm
Branch
inline-sidebar-web-and-native-ENG-530
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

• benschac created this revision.May 4 2022, 9:00 AM
Herald added subscribers: • abosh, • karol, • adrian, tomek. · View Herald TranscriptMay 4 2022, 9:00 AM
• benschac mentioned this in D3895: [web] [chore] [ENG-530] style inline sidebar.May 4 2022, 9:00 AM
• benschac added a parent revision: D3897: [native] [chore] [ENG-530] remove arrows from inline sidebar.
Harbormaster completed remote builds in B8779: Diff 12226.May 4 2022, 9:04 AM
• benschac requested review of this revision.May 4 2022, 9:04 AM
ashoat accepted this revision.May 4 2022, 11:12 AM
This revision is now accepted and ready to land.May 4 2022, 11:12 AM
ashoat added a comment.May 4 2022, 11:12 AM

(Assuming InlineSidebar gets renamed in a separate diff)

• benschac added a child revision: D3963: [native] [fix] [ENG-1099] fix hot reload compose component.May 6 2022, 1:47 PM
• benschac added a child revision: D3971: [refactor] [native] [ENG-530] Remove positioning prop from InlineSidebar component.May 9 2022, 10:34 AM
atul commandeered this revision.Aug 15 2022, 10:03 AM
atul abandoned this revision.
atul edited reviewers, added: • benschac; removed: atul.
atul foisted this revision upon • benschac.
atul edited reviewers, added: atul; removed: • benschac.

Revision Contents
Changeset List

PathSize
lib/
hooks/
inline-engagement-text.react.js
inline-sidebar-text.react.js
4 lines
native/
chat/
4 lines
web/
chat/
4 lines

Diff 12226

View Options

lib/hooks/inline-engagement-text.react.js

Show All 17 Lines
import app.comm.android.ExpoUtils; import app.comm.android.ExpoUtils;
import app.comm.android.MainActivity; import app.comm.android.MainActivity;
import app.comm.android.R; import app.comm.android.R;
import app.comm.android.fbjni.CommSecureStore; import app.comm.android.fbjni.CommSecureStore;
import app.comm.android.fbjni.GlobalDBSingleton; import app.comm.android.fbjni.GlobalDBSingleton;
import app.comm.android.fbjni.MessageOperationsUtilities; import app.comm.android.fbjni.MessageOperationsUtilities;
import app.comm.android.fbjni.NetworkModule; import app.comm.android.fbjni.NetworkModule;
import app.comm.android.fbjni.NotificationsCryptoModule; import app.comm.android.fbjni.NotificationsCryptoModule;
import app.comm.android.fbjni.StaffUtils;
import app.comm.android.fbjni.ThreadOperations; import app.comm.android.fbjni.ThreadOperations;
import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.FirebaseMessagingService;
import com.google.firebase.messaging.RemoteMessage; import com.google.firebase.messaging.RemoteMessage;
import java.io.File; import java.io.File;
import java.lang.StringBuilder;
import java.util.ArrayList;
import me.leolin.shortcutbadger.ShortcutBadger; import me.leolin.shortcutbadger.ShortcutBadger;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
public class CommNotificationsHandler extends FirebaseMessagingService { public class CommNotificationsHandler extends FirebaseMessagingService {
private static final String BADGE_KEY = "badge"; private static final String BADGE_KEY = "badge";
private static final String BADGE_ONLY_KEY = "badgeOnly"; private static final String BADGE_ONLY_KEY = "badgeOnly";
private static final String BACKGROUND_NOTIF_TYPE_KEY = "backgroundNotifType"; private static final String BACKGROUND_NOTIF_TYPE_KEY = "backgroundNotifType";
private static final String SET_UNREAD_STATUS_KEY = "setUnreadStatus"; private static final String SET_UNREAD_STATUS_KEY = "setUnreadStatus";
private static final String NOTIF_ID_KEY = "id"; private static final String NOTIF_ID_KEY = "id";
private static final String ENCRYPTED_PAYLOAD_KEY = "encryptedPayload"; private static final String ENCRYPTED_PAYLOAD_KEY = "encryptedPayload";
private static final String ENCRYPTION_FAILED_KEY = "encryptionFailed"; 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 String CHANNEL_ID = "default";
private static final long[] VIBRATION_SPEC = {500, 500}; private static final long[] VIBRATION_SPEC = {500, 500};
private Bitmap displayableNotificationLargeIcon; private Bitmap displayableNotificationLargeIcon;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
public static final String RESCIND_KEY = "rescind"; public static final String RESCIND_KEY = "rescind";
public static final String RESCIND_ID_KEY = "rescindID"; public static final String RESCIND_ID_KEY = "rescindID";
▲ Show 20 Lines • Show All 132 Lines • ▼ Show 20 Lines private void handleNotificationRescind(RemoteMessage message) {
for (StatusBarNotification notification : for (StatusBarNotification notification :
notificationManager.getActiveNotifications()) { notificationManager.getActiveNotifications()) {
String tag = notification.getTag(); String tag = notification.getTag();
boolean isGroupMember = boolean isGroupMember =
threadID.equals(notification.getNotification().getGroup()); threadID.equals(notification.getNotification().getGroup());
boolean isGroupSummary = boolean isGroupSummary =
(notification.getNotification().flags & (notification.getNotification().flags &
Notification.FLAG_GROUP_SUMMARY) == Notification.FLAG_GROUP_SUMMARY; Notification.FLAG_GROUP_SUMMARY) == Notification.FLAG_GROUP_SUMMARY;
if (tag != null && tag.equals(rescindID)) { if (tag != null && tag.equals(rescindID)) {
notificationManager.cancel(notification.getTag(), notification.getId()); notificationManager.cancel(notification.getTag(), notification.getId());
} else if (isGroupMember && isGroupSummary) { } else if (isGroupMember && isGroupSummary) {
groupSummaryPresent = true; groupSummaryPresent = true;
removeNotificationFromGroupSummary(threadID, rescindID, notification);
} else if (isGroupMember) { } else if (isGroupMember) {
threadGroupPresent = true; threadGroupPresent = true;
} else if (isGroupSummary) {
checkForUnmatchedRescind(threadID, rescindID, notification);
} }
} }
if (groupSummaryPresent && !threadGroupPresent) { if (groupSummaryPresent && !threadGroupPresent) {
notificationManager.cancel(threadID, threadID.hashCode()); notificationManager.cancel(threadID, threadID.hashCode());
} }
} }
Show All 9 Lines private void addToThreadGroupAndDisplay(
NotificationCompat.Builder groupSummaryNotificationBuilder = NotificationCompat.Builder groupSummaryNotificationBuilder =
new NotificationCompat.Builder(this.getApplicationContext()) new NotificationCompat.Builder(this.getApplicationContext())
.setChannelId(CHANNEL_ID) .setChannelId(CHANNEL_ID)
.setSmallIcon(R.drawable.notif_icon) .setSmallIcon(R.drawable.notif_icon)
.setContentIntent( .setContentIntent(
this.createStartMainActivityAction(threadID, threadID)) this.createStartMainActivityAction(threadID, threadID))
.setGroup(threadID) .setGroup(threadID)
.setGroupSummary(true) .setGroupSummary(true)
.setAutoCancel(true) .setAutoCancel(false)
ashoatUnsubmitted
Not Done
Inline Actions

Do we really want to make this change in production? Should we consider gating it on isStaffRelease?

ashoat: Do we really want to make this change in production? Should we consider gating it on…
marcinAuthorUnsubmitted
Done
Inline Actions

This is my oversight. We want it false for staff to avoid accidental evidence removal. However we don't want it for public users. I will update the diff shortly.

marcin: This is my oversight. We want it false for staff to avoid accidental evidence removal. However…
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN); .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN);
if (StaffUtils.isStaffRelease()) {
ArrayList<String> groupNotifIDs =
recordNotificationInGroupSummary(threadID, notificationID);
String notificationSummaryBody = groupNotifIDs.stream().reduce(
"Notif IDs: ", (acc, el) -> acc + System.lineSeparator() + el);
Bundle data = new Bundle();
data.putStringArrayList(GROUP_NOTIF_IDS_KEY, groupNotifIDs);
groupSummaryNotificationBuilder =
groupSummaryNotificationBuilder
.setContentTitle("Summary for thread id " + threadID)
.setExtras(data)
.setStyle(new NotificationCompat.BigTextStyle().bigText(
notificationSummaryBody));
}
notificationManager.notify( notificationManager.notify(
notificationID, notificationID.hashCode(), notificationBuilder.build()); notificationID, notificationID.hashCode(), notificationBuilder.build());
notificationManager.notify( notificationManager.notify(
threadID, threadID.hashCode(), groupSummaryNotificationBuilder.build()); threadID, threadID.hashCode(), groupSummaryNotificationBuilder.build());
} }
private void displayNotification(RemoteMessage message) { private void displayNotification(RemoteMessage message) {
if (message.getData().get(RESCIND_KEY) != null) { if (message.getData().get(RESCIND_KEY) != null) {
▲ Show 20 Lines • Show All 81 Lines • ▼ Show 20 Linespublic class CommNotificationsHandler extends FirebaseMessagingService {
} }
private Bundle private Bundle
serializeMessageDataForIntentAttachment(RemoteMessage message) { serializeMessageDataForIntentAttachment(RemoteMessage message) {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
message.getData().forEach(bundle::putString); message.getData().forEach(bundle::putString);
return bundle; 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 =
errorNotificationBuilder.setContentText(errorMessage);
}
if (errorTitle != null) {
errorNotificationBuilder =
errorNotificationBuilder.setContentTitle(errorTitle);
}
if (largeErrorData != null) {
errorNotificationBuilder = 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 = new ArrayList<>();
for (StatusBarNotification notif :
notificationManager.getActiveNotifications()) {
if (!isGroupSummary(notif, threadID)) {
continue;
}
groupNotifIDs = notif.getNotification().extras.getStringArrayList(
GROUP_NOTIF_IDS_KEY);
break;
}
groupNotifIDs.add(notificationID);
return groupNotifIDs;
}
private void removeNotificationFromGroupSummary(
String threadID,
String notificationID,
StatusBarNotification groupSummaryNotification) {
if (!StaffUtils.isStaffRelease()) {
return;
}
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);
}
int notificationIndex = groupNotifIDs.indexOf(notificationID);
if (notificationIndex == -1) {
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;
}
groupNotifIDs.remove(notificationIndex);
String notificationSummaryBody = groupNotifIDs.stream().reduce(
"Notif IDs: ", (acc, el) -> acc + System.lineSeparator() + el);
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) {
if (!StaffUtils.isStaffRelease()) {
return;
}
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);
}
}
} }
View Options

lib/hooks/inline-sidebar-text.react.js

Show All 17 Lines
import app.comm.android.ExpoUtils; import app.comm.android.ExpoUtils;
import app.comm.android.MainActivity; import app.comm.android.MainActivity;
import app.comm.android.R; import app.comm.android.R;
import app.comm.android.fbjni.CommSecureStore; import app.comm.android.fbjni.CommSecureStore;
import app.comm.android.fbjni.GlobalDBSingleton; import app.comm.android.fbjni.GlobalDBSingleton;
import app.comm.android.fbjni.MessageOperationsUtilities; import app.comm.android.fbjni.MessageOperationsUtilities;
import app.comm.android.fbjni.NetworkModule; import app.comm.android.fbjni.NetworkModule;
import app.comm.android.fbjni.NotificationsCryptoModule; import app.comm.android.fbjni.NotificationsCryptoModule;
import app.comm.android.fbjni.StaffUtils;
import app.comm.android.fbjni.ThreadOperations; import app.comm.android.fbjni.ThreadOperations;
import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.FirebaseMessagingService;
import com.google.firebase.messaging.RemoteMessage; import com.google.firebase.messaging.RemoteMessage;
import java.io.File; import java.io.File;
import java.lang.StringBuilder;
import java.util.ArrayList;
import me.leolin.shortcutbadger.ShortcutBadger; import me.leolin.shortcutbadger.ShortcutBadger;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
public class CommNotificationsHandler extends FirebaseMessagingService { public class CommNotificationsHandler extends FirebaseMessagingService {
private static final String BADGE_KEY = "badge"; private static final String BADGE_KEY = "badge";
private static final String BADGE_ONLY_KEY = "badgeOnly"; private static final String BADGE_ONLY_KEY = "badgeOnly";
private static final String BACKGROUND_NOTIF_TYPE_KEY = "backgroundNotifType"; private static final String BACKGROUND_NOTIF_TYPE_KEY = "backgroundNotifType";
private static final String SET_UNREAD_STATUS_KEY = "setUnreadStatus"; private static final String SET_UNREAD_STATUS_KEY = "setUnreadStatus";
private static final String NOTIF_ID_KEY = "id"; private static final String NOTIF_ID_KEY = "id";
private static final String ENCRYPTED_PAYLOAD_KEY = "encryptedPayload"; private static final String ENCRYPTED_PAYLOAD_KEY = "encryptedPayload";
private static final String ENCRYPTION_FAILED_KEY = "encryptionFailed"; 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 String CHANNEL_ID = "default";
private static final long[] VIBRATION_SPEC = {500, 500}; private static final long[] VIBRATION_SPEC = {500, 500};
private Bitmap displayableNotificationLargeIcon; private Bitmap displayableNotificationLargeIcon;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
public static final String RESCIND_KEY = "rescind"; public static final String RESCIND_KEY = "rescind";
public static final String RESCIND_ID_KEY = "rescindID"; public static final String RESCIND_ID_KEY = "rescindID";
▲ Show 20 Lines • Show All 132 Lines • ▼ Show 20 Lines private void handleNotificationRescind(RemoteMessage message) {
for (StatusBarNotification notification : for (StatusBarNotification notification :
notificationManager.getActiveNotifications()) { notificationManager.getActiveNotifications()) {
String tag = notification.getTag(); String tag = notification.getTag();
boolean isGroupMember = boolean isGroupMember =
threadID.equals(notification.getNotification().getGroup()); threadID.equals(notification.getNotification().getGroup());
boolean isGroupSummary = boolean isGroupSummary =
(notification.getNotification().flags & (notification.getNotification().flags &
Notification.FLAG_GROUP_SUMMARY) == Notification.FLAG_GROUP_SUMMARY; Notification.FLAG_GROUP_SUMMARY) == Notification.FLAG_GROUP_SUMMARY;
if (tag != null && tag.equals(rescindID)) { if (tag != null && tag.equals(rescindID)) {
notificationManager.cancel(notification.getTag(), notification.getId()); notificationManager.cancel(notification.getTag(), notification.getId());
} else if (isGroupMember && isGroupSummary) { } else if (isGroupMember && isGroupSummary) {
groupSummaryPresent = true; groupSummaryPresent = true;
removeNotificationFromGroupSummary(threadID, rescindID, notification);
} else if (isGroupMember) { } else if (isGroupMember) {
threadGroupPresent = true; threadGroupPresent = true;
} else if (isGroupSummary) {
checkForUnmatchedRescind(threadID, rescindID, notification);
} }
} }
if (groupSummaryPresent && !threadGroupPresent) { if (groupSummaryPresent && !threadGroupPresent) {
notificationManager.cancel(threadID, threadID.hashCode()); notificationManager.cancel(threadID, threadID.hashCode());
} }
} }
Show All 9 Lines private void addToThreadGroupAndDisplay(
NotificationCompat.Builder groupSummaryNotificationBuilder = NotificationCompat.Builder groupSummaryNotificationBuilder =
new NotificationCompat.Builder(this.getApplicationContext()) new NotificationCompat.Builder(this.getApplicationContext())
.setChannelId(CHANNEL_ID) .setChannelId(CHANNEL_ID)
.setSmallIcon(R.drawable.notif_icon) .setSmallIcon(R.drawable.notif_icon)
.setContentIntent( .setContentIntent(
this.createStartMainActivityAction(threadID, threadID)) this.createStartMainActivityAction(threadID, threadID))
.setGroup(threadID) .setGroup(threadID)
.setGroupSummary(true) .setGroupSummary(true)
.setAutoCancel(true) .setAutoCancel(false)
ashoatUnsubmitted
Not Done
Inline Actions

Do we really want to make this change in production? Should we consider gating it on isStaffRelease?

ashoat: Do we really want to make this change in production? Should we consider gating it on…
marcinAuthorUnsubmitted
Done
Inline Actions

This is my oversight. We want it false for staff to avoid accidental evidence removal. However we don't want it for public users. I will update the diff shortly.

marcin: This is my oversight. We want it false for staff to avoid accidental evidence removal. However…
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN); .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN);
if (StaffUtils.isStaffRelease()) {
ArrayList<String> groupNotifIDs =
recordNotificationInGroupSummary(threadID, notificationID);
String notificationSummaryBody = groupNotifIDs.stream().reduce(
"Notif IDs: ", (acc, el) -> acc + System.lineSeparator() + el);
Bundle data = new Bundle();
data.putStringArrayList(GROUP_NOTIF_IDS_KEY, groupNotifIDs);
groupSummaryNotificationBuilder =
groupSummaryNotificationBuilder
.setContentTitle("Summary for thread id " + threadID)
.setExtras(data)
.setStyle(new NotificationCompat.BigTextStyle().bigText(
notificationSummaryBody));
}
notificationManager.notify( notificationManager.notify(
notificationID, notificationID.hashCode(), notificationBuilder.build()); notificationID, notificationID.hashCode(), notificationBuilder.build());
notificationManager.notify( notificationManager.notify(
threadID, threadID.hashCode(), groupSummaryNotificationBuilder.build()); threadID, threadID.hashCode(), groupSummaryNotificationBuilder.build());
} }
private void displayNotification(RemoteMessage message) { private void displayNotification(RemoteMessage message) {
if (message.getData().get(RESCIND_KEY) != null) { if (message.getData().get(RESCIND_KEY) != null) {
▲ Show 20 Lines • Show All 81 Lines • ▼ Show 20 Linespublic class CommNotificationsHandler extends FirebaseMessagingService {
} }
private Bundle private Bundle
serializeMessageDataForIntentAttachment(RemoteMessage message) { serializeMessageDataForIntentAttachment(RemoteMessage message) {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
message.getData().forEach(bundle::putString); message.getData().forEach(bundle::putString);
return bundle; 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 =
errorNotificationBuilder.setContentText(errorMessage);
}
if (errorTitle != null) {
errorNotificationBuilder =
errorNotificationBuilder.setContentTitle(errorTitle);
}
if (largeErrorData != null) {
errorNotificationBuilder = 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 = new ArrayList<>();
for (StatusBarNotification notif :
notificationManager.getActiveNotifications()) {
if (!isGroupSummary(notif, threadID)) {
continue;
}
groupNotifIDs = notif.getNotification().extras.getStringArrayList(
GROUP_NOTIF_IDS_KEY);
break;
}
groupNotifIDs.add(notificationID);
return groupNotifIDs;
}
private void removeNotificationFromGroupSummary(
String threadID,
String notificationID,
StatusBarNotification groupSummaryNotification) {
if (!StaffUtils.isStaffRelease()) {
return;
}
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);
}
int notificationIndex = groupNotifIDs.indexOf(notificationID);
if (notificationIndex == -1) {
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;
}
groupNotifIDs.remove(notificationIndex);
String notificationSummaryBody = groupNotifIDs.stream().reduce(
"Notif IDs: ", (acc, el) -> acc + System.lineSeparator() + el);
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) {
if (!StaffUtils.isStaffRelease()) {
return;
}
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);
}
}
} }
View Options

native/chat/inline-sidebar.react.js

Show All 17 Lines
import app.comm.android.ExpoUtils; import app.comm.android.ExpoUtils;
import app.comm.android.MainActivity; import app.comm.android.MainActivity;
import app.comm.android.R; import app.comm.android.R;
import app.comm.android.fbjni.CommSecureStore; import app.comm.android.fbjni.CommSecureStore;
import app.comm.android.fbjni.GlobalDBSingleton; import app.comm.android.fbjni.GlobalDBSingleton;
import app.comm.android.fbjni.MessageOperationsUtilities; import app.comm.android.fbjni.MessageOperationsUtilities;
import app.comm.android.fbjni.NetworkModule; import app.comm.android.fbjni.NetworkModule;
import app.comm.android.fbjni.NotificationsCryptoModule; import app.comm.android.fbjni.NotificationsCryptoModule;
import app.comm.android.fbjni.StaffUtils;
import app.comm.android.fbjni.ThreadOperations; import app.comm.android.fbjni.ThreadOperations;
import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.FirebaseMessagingService;
import com.google.firebase.messaging.RemoteMessage; import com.google.firebase.messaging.RemoteMessage;
import java.io.File; import java.io.File;
import java.lang.StringBuilder;
import java.util.ArrayList;
import me.leolin.shortcutbadger.ShortcutBadger; import me.leolin.shortcutbadger.ShortcutBadger;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
public class CommNotificationsHandler extends FirebaseMessagingService { public class CommNotificationsHandler extends FirebaseMessagingService {
private static final String BADGE_KEY = "badge"; private static final String BADGE_KEY = "badge";
private static final String BADGE_ONLY_KEY = "badgeOnly"; private static final String BADGE_ONLY_KEY = "badgeOnly";
private static final String BACKGROUND_NOTIF_TYPE_KEY = "backgroundNotifType"; private static final String BACKGROUND_NOTIF_TYPE_KEY = "backgroundNotifType";
private static final String SET_UNREAD_STATUS_KEY = "setUnreadStatus"; private static final String SET_UNREAD_STATUS_KEY = "setUnreadStatus";
private static final String NOTIF_ID_KEY = "id"; private static final String NOTIF_ID_KEY = "id";
private static final String ENCRYPTED_PAYLOAD_KEY = "encryptedPayload"; private static final String ENCRYPTED_PAYLOAD_KEY = "encryptedPayload";
private static final String ENCRYPTION_FAILED_KEY = "encryptionFailed"; 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 String CHANNEL_ID = "default";
private static final long[] VIBRATION_SPEC = {500, 500}; private static final long[] VIBRATION_SPEC = {500, 500};
private Bitmap displayableNotificationLargeIcon; private Bitmap displayableNotificationLargeIcon;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
public static final String RESCIND_KEY = "rescind"; public static final String RESCIND_KEY = "rescind";
public static final String RESCIND_ID_KEY = "rescindID"; public static final String RESCIND_ID_KEY = "rescindID";
▲ Show 20 Lines • Show All 132 Lines • ▼ Show 20 Lines private void handleNotificationRescind(RemoteMessage message) {
for (StatusBarNotification notification : for (StatusBarNotification notification :
notificationManager.getActiveNotifications()) { notificationManager.getActiveNotifications()) {
String tag = notification.getTag(); String tag = notification.getTag();
boolean isGroupMember = boolean isGroupMember =
threadID.equals(notification.getNotification().getGroup()); threadID.equals(notification.getNotification().getGroup());
boolean isGroupSummary = boolean isGroupSummary =
(notification.getNotification().flags & (notification.getNotification().flags &
Notification.FLAG_GROUP_SUMMARY) == Notification.FLAG_GROUP_SUMMARY; Notification.FLAG_GROUP_SUMMARY) == Notification.FLAG_GROUP_SUMMARY;
if (tag != null && tag.equals(rescindID)) { if (tag != null && tag.equals(rescindID)) {
notificationManager.cancel(notification.getTag(), notification.getId()); notificationManager.cancel(notification.getTag(), notification.getId());
} else if (isGroupMember && isGroupSummary) { } else if (isGroupMember && isGroupSummary) {
groupSummaryPresent = true; groupSummaryPresent = true;
removeNotificationFromGroupSummary(threadID, rescindID, notification);
} else if (isGroupMember) { } else if (isGroupMember) {
threadGroupPresent = true; threadGroupPresent = true;
} else if (isGroupSummary) {
checkForUnmatchedRescind(threadID, rescindID, notification);
} }
} }
if (groupSummaryPresent && !threadGroupPresent) { if (groupSummaryPresent && !threadGroupPresent) {
notificationManager.cancel(threadID, threadID.hashCode()); notificationManager.cancel(threadID, threadID.hashCode());
} }
} }
Show All 9 Lines private void addToThreadGroupAndDisplay(
NotificationCompat.Builder groupSummaryNotificationBuilder = NotificationCompat.Builder groupSummaryNotificationBuilder =
new NotificationCompat.Builder(this.getApplicationContext()) new NotificationCompat.Builder(this.getApplicationContext())
.setChannelId(CHANNEL_ID) .setChannelId(CHANNEL_ID)
.setSmallIcon(R.drawable.notif_icon) .setSmallIcon(R.drawable.notif_icon)
.setContentIntent( .setContentIntent(
this.createStartMainActivityAction(threadID, threadID)) this.createStartMainActivityAction(threadID, threadID))
.setGroup(threadID) .setGroup(threadID)
.setGroupSummary(true) .setGroupSummary(true)
.setAutoCancel(true) .setAutoCancel(false)
ashoatUnsubmitted
Not Done
Inline Actions

Do we really want to make this change in production? Should we consider gating it on isStaffRelease?

ashoat: Do we really want to make this change in production? Should we consider gating it on…
marcinAuthorUnsubmitted
Done
Inline Actions

This is my oversight. We want it false for staff to avoid accidental evidence removal. However we don't want it for public users. I will update the diff shortly.

marcin: This is my oversight. We want it false for staff to avoid accidental evidence removal. However…
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN); .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN);
if (StaffUtils.isStaffRelease()) {
ArrayList<String> groupNotifIDs =
recordNotificationInGroupSummary(threadID, notificationID);
String notificationSummaryBody = groupNotifIDs.stream().reduce(
"Notif IDs: ", (acc, el) -> acc + System.lineSeparator() + el);
Bundle data = new Bundle();
data.putStringArrayList(GROUP_NOTIF_IDS_KEY, groupNotifIDs);
groupSummaryNotificationBuilder =
groupSummaryNotificationBuilder
.setContentTitle("Summary for thread id " + threadID)
.setExtras(data)
.setStyle(new NotificationCompat.BigTextStyle().bigText(
notificationSummaryBody));
}
notificationManager.notify( notificationManager.notify(
notificationID, notificationID.hashCode(), notificationBuilder.build()); notificationID, notificationID.hashCode(), notificationBuilder.build());
notificationManager.notify( notificationManager.notify(
threadID, threadID.hashCode(), groupSummaryNotificationBuilder.build()); threadID, threadID.hashCode(), groupSummaryNotificationBuilder.build());
} }
private void displayNotification(RemoteMessage message) { private void displayNotification(RemoteMessage message) {
if (message.getData().get(RESCIND_KEY) != null) { if (message.getData().get(RESCIND_KEY) != null) {
▲ Show 20 Lines • Show All 81 Lines • ▼ Show 20 Linespublic class CommNotificationsHandler extends FirebaseMessagingService {
} }
private Bundle private Bundle
serializeMessageDataForIntentAttachment(RemoteMessage message) { serializeMessageDataForIntentAttachment(RemoteMessage message) {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
message.getData().forEach(bundle::putString); message.getData().forEach(bundle::putString);
return bundle; 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 =
errorNotificationBuilder.setContentText(errorMessage);
}
if (errorTitle != null) {
errorNotificationBuilder =
errorNotificationBuilder.setContentTitle(errorTitle);
}
if (largeErrorData != null) {
errorNotificationBuilder = 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 = new ArrayList<>();
for (StatusBarNotification notif :
notificationManager.getActiveNotifications()) {
if (!isGroupSummary(notif, threadID)) {
continue;
}
groupNotifIDs = notif.getNotification().extras.getStringArrayList(
GROUP_NOTIF_IDS_KEY);
break;
}
groupNotifIDs.add(notificationID);
return groupNotifIDs;
}
private void removeNotificationFromGroupSummary(
String threadID,
String notificationID,
StatusBarNotification groupSummaryNotification) {
if (!StaffUtils.isStaffRelease()) {
return;
}
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);
}
int notificationIndex = groupNotifIDs.indexOf(notificationID);
if (notificationIndex == -1) {
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;
}
groupNotifIDs.remove(notificationIndex);
String notificationSummaryBody = groupNotifIDs.stream().reduce(
"Notif IDs: ", (acc, el) -> acc + System.lineSeparator() + el);
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) {
if (!StaffUtils.isStaffRelease()) {
return;
}
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);
}
}
} }
View Options

web/chat/inline-sidebar.react.js

Show All 17 Lines
import app.comm.android.ExpoUtils; import app.comm.android.ExpoUtils;
import app.comm.android.MainActivity; import app.comm.android.MainActivity;
import app.comm.android.R; import app.comm.android.R;
import app.comm.android.fbjni.CommSecureStore; import app.comm.android.fbjni.CommSecureStore;
import app.comm.android.fbjni.GlobalDBSingleton; import app.comm.android.fbjni.GlobalDBSingleton;
import app.comm.android.fbjni.MessageOperationsUtilities; import app.comm.android.fbjni.MessageOperationsUtilities;
import app.comm.android.fbjni.NetworkModule; import app.comm.android.fbjni.NetworkModule;
import app.comm.android.fbjni.NotificationsCryptoModule; import app.comm.android.fbjni.NotificationsCryptoModule;
import app.comm.android.fbjni.StaffUtils;
import app.comm.android.fbjni.ThreadOperations; import app.comm.android.fbjni.ThreadOperations;
import com.google.firebase.messaging.FirebaseMessagingService; import com.google.firebase.messaging.FirebaseMessagingService;
import com.google.firebase.messaging.RemoteMessage; import com.google.firebase.messaging.RemoteMessage;
import java.io.File; import java.io.File;
import java.lang.StringBuilder;
import java.util.ArrayList;
import me.leolin.shortcutbadger.ShortcutBadger; import me.leolin.shortcutbadger.ShortcutBadger;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
public class CommNotificationsHandler extends FirebaseMessagingService { public class CommNotificationsHandler extends FirebaseMessagingService {
private static final String BADGE_KEY = "badge"; private static final String BADGE_KEY = "badge";
private static final String BADGE_ONLY_KEY = "badgeOnly"; private static final String BADGE_ONLY_KEY = "badgeOnly";
private static final String BACKGROUND_NOTIF_TYPE_KEY = "backgroundNotifType"; private static final String BACKGROUND_NOTIF_TYPE_KEY = "backgroundNotifType";
private static final String SET_UNREAD_STATUS_KEY = "setUnreadStatus"; private static final String SET_UNREAD_STATUS_KEY = "setUnreadStatus";
private static final String NOTIF_ID_KEY = "id"; private static final String NOTIF_ID_KEY = "id";
private static final String ENCRYPTED_PAYLOAD_KEY = "encryptedPayload"; private static final String ENCRYPTED_PAYLOAD_KEY = "encryptedPayload";
private static final String ENCRYPTION_FAILED_KEY = "encryptionFailed"; 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 String CHANNEL_ID = "default";
private static final long[] VIBRATION_SPEC = {500, 500}; private static final long[] VIBRATION_SPEC = {500, 500};
private Bitmap displayableNotificationLargeIcon; private Bitmap displayableNotificationLargeIcon;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
public static final String RESCIND_KEY = "rescind"; public static final String RESCIND_KEY = "rescind";
public static final String RESCIND_ID_KEY = "rescindID"; public static final String RESCIND_ID_KEY = "rescindID";
▲ Show 20 Lines • Show All 132 Lines • ▼ Show 20 Lines private void handleNotificationRescind(RemoteMessage message) {
for (StatusBarNotification notification : for (StatusBarNotification notification :
notificationManager.getActiveNotifications()) { notificationManager.getActiveNotifications()) {
String tag = notification.getTag(); String tag = notification.getTag();
boolean isGroupMember = boolean isGroupMember =
threadID.equals(notification.getNotification().getGroup()); threadID.equals(notification.getNotification().getGroup());
boolean isGroupSummary = boolean isGroupSummary =
(notification.getNotification().flags & (notification.getNotification().flags &
Notification.FLAG_GROUP_SUMMARY) == Notification.FLAG_GROUP_SUMMARY; Notification.FLAG_GROUP_SUMMARY) == Notification.FLAG_GROUP_SUMMARY;
if (tag != null && tag.equals(rescindID)) { if (tag != null && tag.equals(rescindID)) {
notificationManager.cancel(notification.getTag(), notification.getId()); notificationManager.cancel(notification.getTag(), notification.getId());
} else if (isGroupMember && isGroupSummary) { } else if (isGroupMember && isGroupSummary) {
groupSummaryPresent = true; groupSummaryPresent = true;
removeNotificationFromGroupSummary(threadID, rescindID, notification);
} else if (isGroupMember) { } else if (isGroupMember) {
threadGroupPresent = true; threadGroupPresent = true;
} else if (isGroupSummary) {
checkForUnmatchedRescind(threadID, rescindID, notification);
} }
} }
if (groupSummaryPresent && !threadGroupPresent) { if (groupSummaryPresent && !threadGroupPresent) {
notificationManager.cancel(threadID, threadID.hashCode()); notificationManager.cancel(threadID, threadID.hashCode());
} }
} }
Show All 9 Lines private void addToThreadGroupAndDisplay(
NotificationCompat.Builder groupSummaryNotificationBuilder = NotificationCompat.Builder groupSummaryNotificationBuilder =
new NotificationCompat.Builder(this.getApplicationContext()) new NotificationCompat.Builder(this.getApplicationContext())
.setChannelId(CHANNEL_ID) .setChannelId(CHANNEL_ID)
.setSmallIcon(R.drawable.notif_icon) .setSmallIcon(R.drawable.notif_icon)
.setContentIntent( .setContentIntent(
this.createStartMainActivityAction(threadID, threadID)) this.createStartMainActivityAction(threadID, threadID))
.setGroup(threadID) .setGroup(threadID)
.setGroupSummary(true) .setGroupSummary(true)
.setAutoCancel(true) .setAutoCancel(false)
ashoatUnsubmitted
Not Done
Inline Actions

Do we really want to make this change in production? Should we consider gating it on isStaffRelease?

ashoat: Do we really want to make this change in production? Should we consider gating it on…
marcinAuthorUnsubmitted
Done
Inline Actions

This is my oversight. We want it false for staff to avoid accidental evidence removal. However we don't want it for public users. I will update the diff shortly.

marcin: This is my oversight. We want it false for staff to avoid accidental evidence removal. However…
.setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN); .setGroupAlertBehavior(NotificationCompat.GROUP_ALERT_CHILDREN);
if (StaffUtils.isStaffRelease()) {
ArrayList<String> groupNotifIDs =
recordNotificationInGroupSummary(threadID, notificationID);
String notificationSummaryBody = groupNotifIDs.stream().reduce(
"Notif IDs: ", (acc, el) -> acc + System.lineSeparator() + el);
Bundle data = new Bundle();
data.putStringArrayList(GROUP_NOTIF_IDS_KEY, groupNotifIDs);
groupSummaryNotificationBuilder =
groupSummaryNotificationBuilder
.setContentTitle("Summary for thread id " + threadID)
.setExtras(data)
.setStyle(new NotificationCompat.BigTextStyle().bigText(
notificationSummaryBody));
}
notificationManager.notify( notificationManager.notify(
notificationID, notificationID.hashCode(), notificationBuilder.build()); notificationID, notificationID.hashCode(), notificationBuilder.build());
notificationManager.notify( notificationManager.notify(
threadID, threadID.hashCode(), groupSummaryNotificationBuilder.build()); threadID, threadID.hashCode(), groupSummaryNotificationBuilder.build());
} }
private void displayNotification(RemoteMessage message) { private void displayNotification(RemoteMessage message) {
if (message.getData().get(RESCIND_KEY) != null) { if (message.getData().get(RESCIND_KEY) != null) {
▲ Show 20 Lines • Show All 81 Lines • ▼ Show 20 Linespublic class CommNotificationsHandler extends FirebaseMessagingService {
} }
private Bundle private Bundle
serializeMessageDataForIntentAttachment(RemoteMessage message) { serializeMessageDataForIntentAttachment(RemoteMessage message) {
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
message.getData().forEach(bundle::putString); message.getData().forEach(bundle::putString);
return bundle; 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 =
errorNotificationBuilder.setContentText(errorMessage);
}
if (errorTitle != null) {
errorNotificationBuilder =
errorNotificationBuilder.setContentTitle(errorTitle);
}
if (largeErrorData != null) {
errorNotificationBuilder = 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 = new ArrayList<>();
for (StatusBarNotification notif :
notificationManager.getActiveNotifications()) {
if (!isGroupSummary(notif, threadID)) {
continue;
}
groupNotifIDs = notif.getNotification().extras.getStringArrayList(
GROUP_NOTIF_IDS_KEY);
break;
}
groupNotifIDs.add(notificationID);
return groupNotifIDs;
}
private void removeNotificationFromGroupSummary(
String threadID,
String notificationID,
StatusBarNotification groupSummaryNotification) {
if (!StaffUtils.isStaffRelease()) {
return;
}
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);
}
int notificationIndex = groupNotifIDs.indexOf(notificationID);
if (notificationIndex == -1) {
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;
}
groupNotifIDs.remove(notificationIndex);
String notificationSummaryBody = groupNotifIDs.stream().reduce(
"Notif IDs: ", (acc, el) -> acc + System.lineSeparator() + el);
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) {
if (!StaffUtils.isStaffRelease()) {
return;
}
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);
}
}
} }