Page MenuHomePhabricator
Differential D8930

[rust-node-addon] add client method to call getInboundKeysForUser
ClosedPublic
Actions

Authored by varun on Aug 23 2023, 8:33 AM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 16, 11:14 PM
Unknown Object (File)
Sun, Mar 16, 10:13 AM
Unknown Object (File)
Sun, Mar 9, 2:01 PM
Unknown Object (File)
Sat, Mar 8, 8:00 PM
Unknown Object (File)
Tue, Mar 4, 8:35 PM
Unknown Object (File)
Tue, Mar 4, 8:35 PM
Unknown Object (File)
Tue, Mar 4, 8:35 PM
Unknown Object (File)
Tue, Mar 4, 8:34 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
bartek
Commits
rCOMMb82d22a09a85: [rust-node-addon] add client method to call getInboundKeysForUser
Summary

client method calls the mentioned Identity service RPC. we return the keys specific to the device ID provided.

The error handling can be further improved later. For now I'm just returning Generic errors and logging appropriately.

Test Plan
  • called the new client method from keyserver.js after writing some test data to DDB. i got back the keys as expected.
  • tried calling the method with an invalid device ID and got an error.
  • tried calling the method with an invalid username and got an error.
  • tried calling the method with a malformed identifier_type string ("usernam") and got an error

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

varun created this revision.Aug 23 2023, 8:33 AM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptAug 23 2023, 8:33 AM
varun updated this revision to Diff 30262.Aug 23 2023, 8:35 AM

remove unnecessary comments

Harbormaster completed remote builds in B22046: Diff 30262.Aug 23 2023, 8:57 AM
varun requested review of this revision.Aug 23 2023, 8:57 AM
Harbormaster completed remote builds in B22045: Diff 30261.Aug 23 2023, 8:58 AM
bartek accepted this revision.Aug 23 2023, 12:27 PM
bartek added inline comments.
keyserver/addons/rust-node-addon/src/identity_client/mod.rs
142–144 ↗(On Diff #30262)

Can it be done this way? The same for others

This revision is now accepted and ready to land.Aug 23 2023, 12:27 PM
varun added inline comments.Aug 30 2023, 12:04 PM
keyserver/addons/rust-node-addon/src/identity_client/mod.rs
142–144 ↗(On Diff #30262)

yep much cleaner!

Closed by commit rCOMMb82d22a09a85: [rust-node-addon] add client method to call getInboundKeysForUser (authored by varun). · Explain WhyAug 30 2023, 12:04 PM
This revision was automatically updated to reflect the committed changes.
varun added a commit: rCOMMb82d22a09a85: [rust-node-addon] add client method to call getInboundKeysForUser.
kamil mentioned this in D8476: [Keyserver] Publish prekeys to identity service for cron job.Sep 8 2023, 4:34 AM

Revision Contents
Changeset List

PathSize
keyserver/
addons/
rust-node-addon/
17 lines
src/
identity_client/
36 lines
63 lines

Diff 30600

View Options

keyserver/addons/rust-node-addon/rust-binding-types.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

keyserver/addons/rust-node-addon/src/identity_client/get_inbound_keys_for_user.rs

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

keyserver/addons/rust-node-addon/src/identity_client/mod.rs

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);
}
}
} }