Page MenuHomePhabricator
Differential D8942

[reports-service] Introduce database client
ClosedPublic
Actions

Authored by bartek on Aug 25 2023, 3:10 AM.
Tags
None
Referenced Files
F5907704: D8942.id.diff
Thu, Apr 17, 2:38 PM
Unknown Object (File)
Wed, Apr 16, 10:46 PM
Unknown Object (File)
Wed, Apr 16, 8:04 PM
Unknown Object (File)
Wed, Apr 16, 6:00 AM
Unknown Object (File)
Mon, Apr 14, 6:02 PM
Unknown Object (File)
Mon, Apr 14, 7:44 AM
Unknown Object (File)
Tue, Apr 1, 3:07 PM
Unknown Object (File)
Sat, Mar 29, 11:24 AM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
michal
varun
• patryk
• jon
Commits
rCOMMc31b15da92b3: [reports-service] Introduce database client
Summary

Similiar to other services, created a struct representing DynamoDB client.
Created basic interfaces to store and retrieve reports. They're very simple but sufficient for now.

Depends on D8939, D8895

Test Plan

Storing reports was tested in D8895, other methods are tested together with HTTP interface (later in the stack)

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bartek created this revision.Aug 25 2023, 3:10 AM
bartek held this revision as a draft.
Herald added a reviewer: • jon. · View Herald TranscriptAug 25 2023, 3:10 AM
Herald added subscribers: tomek, ashoat. · View Herald Transcript
Harbormaster completed remote builds in B22078: Diff 30306.Aug 25 2023, 3:28 AM
bartek published this revision for review.Aug 25 2023, 4:21 AM
• jon accepted this revision.Aug 25 2023, 4:37 PM
• jon added inline comments.
services/reports/src/database/client.rs
58 ↗(On Diff #30306)

should this go in constants?

102 ↗(On Diff #30306)

Potentially avoid forcing a Vec construction here if we take IntoIter<ReportItem>. But feel strongly about it, as DDB deals with Vec directly.

This revision is now accepted and ready to land.Aug 25 2023, 4:37 PM
bartek added inline comments.Aug 26 2023, 6:47 AM
services/reports/src/database/client.rs
102 ↗(On Diff #30306)

Good point

bartek updated this revision to Diff 30357.Aug 26 2023, 7:57 AM

Address feedback

Harbormaster completed remote builds in B22123: Diff 30357.Aug 26 2023, 8:15 AM
bartek added a child revision: D8970: [reports-service] Endpoint for uploading reports.Aug 28 2023, 7:01 AM
Closed by commit rCOMMc31b15da92b3: [reports-service] Introduce database client (authored by bartek). · Explain WhyAug 29 2023, 8:04 AM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMMc31b15da92b3: [reports-service] Introduce database client.

Revision Contents
Changeset List

PathSize
services/
reports/
src/
database/
75 lines
1 line

Diff 30506

View Options

services/reports/src/database/client.rs

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());
}
}
}
} }
View Options

services/reports/src/database/mod.rs

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