Page MenuHomePhabricator
Differential D7785

[lib] Move socket errors to errors.js
ClosedPublic
Actions

Authored by michal on May 10 2023, 10:16 AM.
Tags
None
Referenced Files
F5887976: D7785.diff
Thu, Apr 17, 4:42 AM
Unknown Object (File)
Wed, Apr 9, 1:17 AM
Unknown Object (File)
Tue, Apr 8, 9:49 PM
Unknown Object (File)
Tue, Apr 8, 9:34 PM
Unknown Object (File)
Thu, Mar 27, 6:53 AM
Unknown Object (File)
Mar 17 2025, 12:55 PM
Unknown Object (File)
Mar 17 2025, 12:55 PM
Unknown Object (File)
Mar 17 2025, 12:54 PM
View All Files
Subscribers
ashoat
atul

Details

Reviewers
kamil
tomek
ashoat
Commits
rCOMM179dc8da526a: [lib] Move socket errors to errors.js
Summary

Moves socket errors to errors.js to prevent cyclic dependencies. I don't we are using ExtendableError in any other place, so I think this move makes sense.

Depends on D7783

Test Plan

Run flow and jest, check if web and landing work.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

Diff 26459

View Options

lib/socket/api-request-handler.react.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());
}
}
}
} }
View Options

lib/socket/inflight-requests.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());
}
}
}
} }
View Options

lib/socket/request-response-handler.react.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());
}
}
}
} }
View Options

lib/socket/socket.react.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());
}
}
}
} }
View Options

lib/utils/call-server-endpoint.js

Loading...
View Options

lib/utils/errors.js

Loading...