[lib] add local is field to reports
ClosedPublic
Actions

Authored by kamil on May 22 2023, 6:32 AM.

Details

Reviewers

tomek
michal

Commits

rCOMM1fd195c04737: [lib] add local is field to reports

Summary

Those ids will help with moving reports to SQLite - we will not have to compare entire objects, only ids.

Test Plan

N/A

Diff Detail

Repository

rCOMM Comm

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

kamil created this revision.May 22 2023, 6:32 AM

kamil held this revision as a draft.

Herald added subscribers: atul, ashoat. · View Herald TranscriptMay 22 2023, 6:32 AM

kamil added a child revision: D7910: [lib] extract local id field before sending report.May 22 2023, 6:37 AM

Harbormaster completed remote builds in B19591: Diff 26776.May 22 2023, 6:51 AM

kamil published this revision for review.May 23 2023, 1:35 AM

tomek accepted this revision.May 23 2023, 3:00 AM

tomek added inline comments.

lib/types/report-types.js
109 ↗	(On Diff #26776)	Why this is optional?

This revision is now accepted and ready to land.May 23 2023, 3:00 AM

rebase

kamil added inline comments.May 29 2023, 1:46 AM

lib/types/report-types.js
109 ↗	(On Diff #26776)	To make id logically correct, adding this as optional, in next diffs making sure that this field will not have to be optional, and then updating this in D7916.

Harbormaster completed remote builds in B19804: Diff 27118.May 29 2023, 1:59 AM

Closed by commit rCOMM1fd195c04737: [lib] add local is field to reports (authored by kamil). · Explain WhyMay 29 2023, 3:07 AM

This revision was automatically updated to reflect the committed changes.

kamil added a commit: rCOMM1fd195c04737: [lib] add local is field to reports.

ashoat mentioned this in D9863: [Flow202][keyserver][skip-ci] [14/x] Address type errors with report-responders.js.Nov 14 2023, 6:01 AM

Revision Contents
Changeset List

Path

Size

lib/

types/

report-types.js

5 lines

Diff 27125

View Options

lib/types/report-types.js

package app.comm.android;		package app.comm.android;

import android.app.NotificationManager;		import android.app.NotificationManager;
import android.content.Context;		import android.content.Context;
import android.service.notification.StatusBarNotification;		import android.service.notification.StatusBarNotification;
import android.util.Log;		import android.util.Log;
		import app.comm.android.fbjni.CommSecureStore;
import app.comm.android.fbjni.NetworkModule;		import app.comm.android.fbjni.NetworkModule;
		import app.comm.android.fbjni.ThreadOperations;
import com.google.firebase.messaging.RemoteMessage;		import com.google.firebase.messaging.RemoteMessage;
		import expo.modules.securestore.SecureStoreModule;
import io.invertase.firebase.messaging.RNFirebaseMessagingService;		import io.invertase.firebase.messaging.RNFirebaseMessagingService;
		import java.io.File;
import me.leolin.shortcutbadger.ShortcutBadger;		import me.leolin.shortcutbadger.ShortcutBadger;

/**		/**
* We're extending RNFirebaseMessagingService here instead of		* We're extending RNFirebaseMessagingService here instead of
* FirebaseMessagingService which is not ideal but let's us work around an		* FirebaseMessagingService which is not ideal but let's us work around an
* Android limitation. If there are a couple of FirebaseMessagingServices		* Android limitation. If there are a couple of FirebaseMessagingServices
* declared in manifest, only the first one would get all the notifications.		* declared in manifest, only the first one would get all the notifications.
* So we need to find a way to have only one service that implements this.		* So we need to find a way to have only one service that implements this.
Show All 17 Lines
* the easiest in terms of making it safe.		* the easiest in terms of making it safe.
*/		*/
public class CommNotificationsHandler extends RNFirebaseMessagingService {		public class CommNotificationsHandler extends RNFirebaseMessagingService {
private static final String RESCIND_KEY = "rescind";		private static final String RESCIND_KEY = "rescind";
private static final String RESCIND_ID_KEY = "rescindID";		private static final String RESCIND_ID_KEY = "rescindID";
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 THREAD_ID_KEY = "threadID";
		private static final String SET_UNREAD_STATUS_KEY = "setUnreadStatus";
private NotificationManager notificationManager;		private NotificationManager notificationManager;

@Override		@Override
public void onCreate() {		public void onCreate() {
super.onCreate();		super.onCreate();
		CommSecureStore.getInstance().initialize(
		() -> new SecureStoreModule(this.getApplicationContext()));
notificationManager = (NotificationManager)this.getSystemService(		notificationManager = (NotificationManager)this.getSystemService(
Context.NOTIFICATION_SERVICE);		Context.NOTIFICATION_SERVICE);
}		}

@Override		@Override
public void onMessageReceived(RemoteMessage message) {		public void onMessageReceived(RemoteMessage message) {
String rescind = message.getData().get(RESCIND_KEY);		String rescind = message.getData().get(RESCIND_KEY);
String rescindID = message.getData().get(RESCIND_ID_KEY);
if ("true".equals(rescind) &&		if ("true".equals(rescind) &&
android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {		android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
for (StatusBarNotification notification :		handleNotificationRescind(message);
notificationManager.getActiveNotifications()) {
if (notification.getTag().equals(rescindID)) {
notificationManager.cancel(
notification.getTag(), notification.getId());
}
}
}		}

String badge = message.getData().get(BADGE_KEY);		String badge = message.getData().get(BADGE_KEY);
if (badge != null) {		if (badge != null) {
try {		try {
int badgeCount = Integer.parseInt(badge);		int badgeCount = Integer.parseInt(badge);
if (badgeCount > 0) {		if (badgeCount > 0) {
ShortcutBadger.applyCount(this, badgeCount);		ShortcutBadger.applyCount(this, badgeCount);
Show All 14 Lines	String backgroundNotifType =
message.getData().get(BACKGROUND_NOTIF_TYPE_KEY);		message.getData().get(BACKGROUND_NOTIF_TYPE_KEY);
if ("PING".equals(backgroundNotifType)) {		if ("PING".equals(backgroundNotifType)) {
NetworkModule.sendPong();		NetworkModule.sendPong();
return;		return;
}		}

super.onMessageReceived(message);		super.onMessageReceived(message);
}		}

		private void handleNotificationRescind(RemoteMessage message) {
		String setUnreadStatus = message.getData().get(SET_UNREAD_STATUS_KEY);
		if ("true".equals(setUnreadStatus)) {
		File sqliteFile =
		this.getApplicationContext().getDatabasePath("comm.sqlite");
		if (sqliteFile.exists()) {
		String threadID = message.getData().get(THREAD_ID_KEY);
		ThreadOperations.updateSQLiteUnreadStatus(
		sqliteFile.getPath(), threadID, false);
		} else {
		Log.w(
		"COMM",
		"Database not existing yet. Skipping thread status update.");
		}
		}
		String rescindID = message.getData().get(RESCIND_ID_KEY);
		for (StatusBarNotification notification :
		notificationManager.getActiveNotifications()) {
		if (notification.getTag().equals(rescindID)) {
		notificationManager.cancel(notification.getTag(), notification.getId());
		}
		}
		}
}		}

[lib] add local is field to reportsClosedPublicActions