Page MenuHomePhabricator
Differential D9350

[blob] Add struct for representing unchecked blobs
ClosedPublic
Actions

Authored by bartek on Oct 4 2023, 3:02 AM.
Tags
None
Referenced Files
Unknown Object (File)
Mon, Mar 17, 12:18 AM
Unknown Object (File)
Tue, Mar 11, 10:35 PM
Unknown Object (File)
Fri, Mar 7, 6:07 PM
Unknown Object (File)
Fri, Mar 7, 6:07 PM
Unknown Object (File)
Fri, Mar 7, 6:07 PM
Unknown Object (File)
Fri, Mar 7, 6:07 PM
Unknown Object (File)
Fri, Mar 7, 6:06 PM
Unknown Object (File)
Fri, Mar 7, 6:01 PM
View All Files
Subscribers
ashoat
will

Details

Reviewers
tomek
michal
varun
• jon
Commits
rCOMMbec5074be99e: [blob] Add struct for representing unchecked blobs
Summary

Added a struct for representing unchecked items in database. It greatly simplifies the cleanup job.
It is used in the next two diffs

Depends on D9349

Test Plan

Code compiles, implementation is tested in the next two diffs.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bartek created this revision.Oct 4 2023, 3:02 AM
bartek held this revision as a draft.
Herald added a reviewer: • jon. · View Herald TranscriptOct 4 2023, 3:02 AM
Herald added subscribers: will, ashoat. · View Herald Transcript
bartek added a child revision: D9351: [blob] Implement cleanup helper functions.Oct 4 2023, 3:04 AM
Harbormaster completed remote builds in B22958: Diff 31622.Oct 4 2023, 3:19 AM
bartek published this revision for review.Oct 4 2023, 3:20 AM
bartek updated this revision to Diff 31786.Oct 9 2023, 5:33 AM

Rebase. Add debug derive

Harbormaster completed remote builds in B23084: Diff 31786.Oct 9 2023, 5:52 AM
tomek accepted this revision.Oct 10 2023, 4:46 AM
tomek added 1 blocking reviewer(s): michal.
michal accepted this revision.Oct 10 2023, 6:09 AM
michal added inline comments.
services/blob/src/service.rs
232–235 ↗(On Diff #31786)

From looking at the later code it seems like we could just have:

struct UncheckedItem {
  has_hash: bool,
  holders: Vec<String>,
};

but it's fine the way it is now.

If dynamodb allowed deletion with just partition key we could even just have has_holders: bool...

277 ↗(On Diff #31786)

Can you add a comment (or a type alias) that explains what a String is in this case?

This revision is now accepted and ready to land.Oct 10 2023, 6:09 AM
bartek added inline comments.Oct 10 2023, 7:33 AM
services/blob/src/service.rs
232–235 ↗(On Diff #31786)

Theoretically yes, at some point I even considered that. However, I wanted each UncheckedItem to be independent: to contain full information about blob, regardless if it's inside or outside a map-like collection.

bartek updated this revision to Diff 31915.Oct 11 2023, 2:47 AM

Address feedback: Add type alias for blob hash, use ref instead of cloning.

Harbormaster completed remote builds in B23171: Diff 31915.Oct 11 2023, 3:05 AM
Closed by commit rCOMMbec5074be99e: [blob] Add struct for representing unchecked blobs (authored by bartek). · Explain WhyOct 16 2023, 1:40 AM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMMbec5074be99e: [blob] Add struct for representing unchecked blobs.

Revision Contents
Changeset List

PathSize
services/
blob/
src/
79 lines

Diff 32017

View Options

services/blob/src/service.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);
}
}
} }