Paths

Table of Contentst

-
native/chat/
-
chat/
1/2
composed-message.react.js

[native] [refactor] [ENG-530] refactor container margin bottom if statement
ClosedPublic
Actions

Authored by • benschac on May 10 2022, 10:36 AM.

Details

Reviewers

atul
tomek
• jacek
• derek

Commits

rCOMM206d81a9a618: [native] [refactor] [ENG-530] refactor container margin bottom if statement

Summary

use if else syntax the that's used project wide.

before:

after:

Test Plan

Cluster margin should work as expected in chat view.

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 10 2022, 10:36 AM

Herald added subscribers: • abosh, • adrian, ashoat. · View Herald TranscriptMay 10 2022, 10:36 AM

• benschac added a parent revision: D3996: [native] [refactor] [ENG-530] organize constants and utils in chat directory.May 10 2022, 10:36 AM

• benschac edited the summary of this revision. (Show Details)

• benschac added inline comments.May 10 2022, 10:39 AM

native/chat/composed-message.react.js
78 ↗	(On Diff #12525)	Additionally, I need to add another condition in here and using an if else is easier to read here.

Harbormaster completed remote builds in B8991: Diff 12525.May 10 2022, 10:41 AM

• benschac requested review of this revision.May 10 2022, 10:41 AM

[native] [fix] [ENG-1123] update chat bubble design

Harbormaster completed remote builds in B8992: Diff 12526.May 10 2022, 11:46 AM

• benschac added a child revision: D3998: [native] [fix] [ENG-1123] update message chat bubble design to match design (more padding and line height).May 10 2022, 11:56 AM

This is not only a refactor, but it also changes the logic. In the previous version, when item.endsCluster then marginBottom: 5 + clusterEndHeight, but now marginBottom: clusterEndHeight. Is that intentional?

This revision now requires changes to proceed.May 11 2022, 5:46 AM

fix logic

In D3997#112145, @palys-swm wrote:

This is not only a refactor, but it also changes the logic. In the previous version, when item.endsCluster then marginBottom: 5 + clusterEndHeight, but now marginBottom: clusterEndHeight. Is that intentional?

You're right, thanks for catching this.

Harbormaster failed remote builds in B8997: Diff 12535!May 11 2022, 6:06 AM

tomek accepted this revision.May 11 2022, 6:08 AM

This revision is now accepted and ready to land.May 11 2022, 6:08 AM

Harbormaster completed remote builds in B8997: Diff 12535.May 11 2022, 9:25 AM

Closed by commit rCOMM206d81a9a618: [native] [refactor] [ENG-530] refactor container margin bottom if statement (authored by • benschac). · Explain WhyMay 11 2022, 11:42 AM

This revision was automatically updated to reflect the committed changes.

• benschac added a commit: rCOMM206d81a9a618: [native] [refactor] [ENG-530] refactor container margin bottom if statement.

Revision Contents
Changeset List

Path

Size

native/

chat/

composed-message.react.js

8 lines

Diff 12526

View Options

native/chat/composed-message.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 Lines	public 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);
		}
		}
}		}

[native] [refactor] [ENG-530] refactor container margin bottom if statementClosedPublicActions