Page MenuHomePhabricator
Differential D12837

Bump olm version
ClosedPublic
Actions

Authored by marcin on Jul 22 2024, 7:15 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 14, 10:57 PM
Unknown Object (File)
Tue, Mar 11, 10:40 AM
Unknown Object (File)
Mon, Mar 10, 8:33 AM
Unknown Object (File)
Mar 6 2025, 1:28 PM
Unknown Object (File)
Mar 5 2025, 5:00 PM
Unknown Object (File)
Mar 3 2025, 5:20 PM
Unknown Object (File)
Mar 3 2025, 5:20 PM
Unknown Object (File)
Mar 3 2025, 5:20 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
kamil
Commits
rCOMM981c620dff97: Bump olm version
Summary

This differential bumps olm version to be able to use is_sender_chain_empty method on Session objects introduced in version 0.2.1.

Test Plan

N/A

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

marcin created this revision.Jul 22 2024, 7:15 AM
Herald added subscribers: tomek, ashoat. · View Herald TranscriptJul 22 2024, 7:15 AM
marcin added a parent revision: D12750: Implement inbound notif session creation from the NSE with race condition handling.Jul 22 2024, 7:16 AM
marcin added a child revision: D12838: Implement web notifs session createion with race condition handling.
Harbormaster completed remote builds in B30562: Diff 42610.Jul 22 2024, 7:31 AM
marcin requested review of this revision.Jul 22 2024, 7:31 AM
kamil accepted this revision.Jul 23 2024, 1:21 AM
This revision is now accepted and ready to land.Jul 23 2024, 1:21 AM
marcin updated this revision to Diff 42947.Jul 30 2024, 3:28 AM

Update phab

Harbormaster completed remote builds in B30802: Diff 42947.Jul 30 2024, 5:24 AM
marcin updated this revision to Diff 43085.Aug 5 2024, 4:19 AM

Rebase before landing

Harbormaster completed remote builds in B30905: Diff 43085.Aug 5 2024, 6:22 AM
Closed by commit rCOMM981c620dff97: Bump olm version (authored by marcin, committed by Marcin Wąsowicz <marcinwasowicz@MacBook-Pro-Marcin.local>). · Explain WhyAug 5 2024, 6:40 AM
This revision was automatically updated to reflect the committed changes.
Marcin Wąsowicz <marcinwasowicz@MacBook-Pro-Marcin.local> added a commit: rCOMM981c620dff97: Bump olm version.

Revision Contents
Changeset List

PathSize
keyserver/
flow-typed/
npm/
@commapp/
1 line
2 lines
lib/
flow-typed/
npm/
@commapp/
1 line
2 lines
native/
2 lines
web/
flow-typed/
npm/
@commapp/
1 line
2 lines
12 lines

Diff 42610

View Options

keyserver/flow-typed/npm/@commapp/olm_vx.x.x.js

Show All 13 Lines
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.ProcessLifecycleOwner; import androidx.lifecycle.ProcessLifecycleOwner;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
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.aescrypto.AESCryptoModuleCompat; import app.comm.android.aescrypto.AESCryptoModuleCompat;
import app.comm.android.commservices.CommAndroidBlobClient; import app.comm.android.commservices.CommAndroidServicesClient;
import app.comm.android.fbjni.CommMMKV; import app.comm.android.fbjni.CommMMKV;
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.StaffUtils;
import app.comm.android.fbjni.ThreadOperations; import app.comm.android.fbjni.ThreadOperations;
Show All 33 Linespublic class CommNotificationsHandler extends FirebaseMessagingService {
// Those and future MMKV-related constants should match // Those and future MMKV-related constants should match
// similar constants in NotificationService.mm // similar constants in NotificationService.mm
private static final String MMKV_KEY_SEPARATOR = "."; private static final String MMKV_KEY_SEPARATOR = ".";
private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER"; private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER";
private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT"; private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT";
private Bitmap displayableNotificationLargeIcon; private Bitmap displayableNotificationLargeIcon;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
private CommAndroidBlobClient blobClient; private CommAndroidServicesClient servicesClient;
private AESCryptoModuleCompat aesCryptoModule; private AESCryptoModuleCompat aesCryptoModule;
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";
public static final String TITLE_KEY = "title"; public static final String TITLE_KEY = "title";
public static final String PREFIX_KEY = "prefix"; public static final String PREFIX_KEY = "prefix";
public static final String BODY_KEY = "body"; public static final String BODY_KEY = "body";
public static final String MESSAGE_INFOS_KEY = "messageInfos"; public static final String MESSAGE_INFOS_KEY = "messageInfos";
public static final String THREAD_ID_KEY = "threadID"; public static final String THREAD_ID_KEY = "threadID";
public static final String TOKEN_EVENT = "TOKEN_EVENT"; public static final String TOKEN_EVENT = "TOKEN_EVENT";
public static final String MESSAGE_EVENT = "MESSAGE_EVENT"; public static final String MESSAGE_EVENT = "MESSAGE_EVENT";
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
CommSecureStore.getInstance().initialize( CommSecureStore.getInstance().initialize(
ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext())); ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext()));
notificationManager = (NotificationManager)this.getSystemService( notificationManager = (NotificationManager)this.getSystemService(
Context.NOTIFICATION_SERVICE); Context.NOTIFICATION_SERVICE);
localBroadcastManager = LocalBroadcastManager.getInstance(this); localBroadcastManager = LocalBroadcastManager.getInstance(this);
displayableNotificationLargeIcon = BitmapFactory.decodeResource( displayableNotificationLargeIcon = BitmapFactory.decodeResource(
this.getApplicationContext().getResources(), R.mipmap.ic_launcher); this.getApplicationContext().getResources(), R.mipmap.ic_launcher);
blobClient = new CommAndroidBlobClient(); servicesClient = new CommAndroidServicesClient();
aesCryptoModule = new AESCryptoModuleCompat(); aesCryptoModule = new AESCryptoModuleCompat();
} }
@Override @Override
public void onNewToken(String token) { public void onNewToken(String token) {
Intent intent = new Intent(TOKEN_EVENT); Intent intent = new Intent(TOKEN_EVENT);
intent.putExtra("token", token); intent.putExtra("token", token);
localBroadcastManager.sendBroadcast(intent); localBroadcastManager.sendBroadcast(intent);
▲ Show 20 Lines • Show All 220 Lines • ▼ Show 20 Lines if (rawMessageInfosString != null && sqliteFile.exists()) {
Log.w("COMM", "Database not existing yet. Skipping notification"); Log.w("COMM", "Database not existing yet. Skipping notification");
} }
} }
private void handleLargeNotification(RemoteMessage message) { private void handleLargeNotification(RemoteMessage message) {
String blobHash = message.getData().get(BLOB_HASH_KEY); String blobHash = message.getData().get(BLOB_HASH_KEY);
String blobHolder = message.getData().get(BLOB_HOLDER_KEY); String blobHolder = message.getData().get(BLOB_HOLDER_KEY);
try { try {
byte[] largePayload = blobClient.getBlobSync(blobHash); byte[] largePayload = servicesClient.getBlobSync(blobHash);
message = aesDecryptRemoteMessage(message, largePayload); message = aesDecryptRemoteMessage(message, largePayload);
handleMessageInfosPersistence(message); handleMessageInfosPersistence(message);
} catch (Exception e) { } catch (Exception e) {
Log.w("COMM", "Failure when handling large notification.", e); Log.w("COMM", "Failure when handling large notification.", e);
} }
blobClient.scheduleDeferredBlobDeletion( servicesClient.scheduleDeferredBlobDeletion(
blobHash, blobHolder, this.getApplicationContext()); blobHash, blobHolder, this.getApplicationContext());
} }
private void addToThreadGroupAndDisplay( private void addToThreadGroupAndDisplay(
String notificationID, String notificationID,
NotificationCompat.Builder notificationBuilder, NotificationCompat.Builder notificationBuilder,
String threadID) { String threadID) {
▲ Show 20 Lines • Show All 304 Lines • Show Last 20 Lines
View Options

keyserver/package.json

Show All 13 Lines
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.ProcessLifecycleOwner; import androidx.lifecycle.ProcessLifecycleOwner;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
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.aescrypto.AESCryptoModuleCompat; import app.comm.android.aescrypto.AESCryptoModuleCompat;
import app.comm.android.commservices.CommAndroidBlobClient; import app.comm.android.commservices.CommAndroidServicesClient;
import app.comm.android.fbjni.CommMMKV; import app.comm.android.fbjni.CommMMKV;
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.StaffUtils;
import app.comm.android.fbjni.ThreadOperations; import app.comm.android.fbjni.ThreadOperations;
Show All 33 Linespublic class CommNotificationsHandler extends FirebaseMessagingService {
// Those and future MMKV-related constants should match // Those and future MMKV-related constants should match
// similar constants in NotificationService.mm // similar constants in NotificationService.mm
private static final String MMKV_KEY_SEPARATOR = "."; private static final String MMKV_KEY_SEPARATOR = ".";
private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER"; private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER";
private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT"; private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT";
private Bitmap displayableNotificationLargeIcon; private Bitmap displayableNotificationLargeIcon;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
private CommAndroidBlobClient blobClient; private CommAndroidServicesClient servicesClient;
private AESCryptoModuleCompat aesCryptoModule; private AESCryptoModuleCompat aesCryptoModule;
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";
public static final String TITLE_KEY = "title"; public static final String TITLE_KEY = "title";
public static final String PREFIX_KEY = "prefix"; public static final String PREFIX_KEY = "prefix";
public static final String BODY_KEY = "body"; public static final String BODY_KEY = "body";
public static final String MESSAGE_INFOS_KEY = "messageInfos"; public static final String MESSAGE_INFOS_KEY = "messageInfos";
public static final String THREAD_ID_KEY = "threadID"; public static final String THREAD_ID_KEY = "threadID";
public static final String TOKEN_EVENT = "TOKEN_EVENT"; public static final String TOKEN_EVENT = "TOKEN_EVENT";
public static final String MESSAGE_EVENT = "MESSAGE_EVENT"; public static final String MESSAGE_EVENT = "MESSAGE_EVENT";
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
CommSecureStore.getInstance().initialize( CommSecureStore.getInstance().initialize(
ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext())); ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext()));
notificationManager = (NotificationManager)this.getSystemService( notificationManager = (NotificationManager)this.getSystemService(
Context.NOTIFICATION_SERVICE); Context.NOTIFICATION_SERVICE);
localBroadcastManager = LocalBroadcastManager.getInstance(this); localBroadcastManager = LocalBroadcastManager.getInstance(this);
displayableNotificationLargeIcon = BitmapFactory.decodeResource( displayableNotificationLargeIcon = BitmapFactory.decodeResource(
this.getApplicationContext().getResources(), R.mipmap.ic_launcher); this.getApplicationContext().getResources(), R.mipmap.ic_launcher);
blobClient = new CommAndroidBlobClient(); servicesClient = new CommAndroidServicesClient();
aesCryptoModule = new AESCryptoModuleCompat(); aesCryptoModule = new AESCryptoModuleCompat();
} }
@Override @Override
public void onNewToken(String token) { public void onNewToken(String token) {
Intent intent = new Intent(TOKEN_EVENT); Intent intent = new Intent(TOKEN_EVENT);
intent.putExtra("token", token); intent.putExtra("token", token);
localBroadcastManager.sendBroadcast(intent); localBroadcastManager.sendBroadcast(intent);
▲ Show 20 Lines • Show All 220 Lines • ▼ Show 20 Lines if (rawMessageInfosString != null && sqliteFile.exists()) {
Log.w("COMM", "Database not existing yet. Skipping notification"); Log.w("COMM", "Database not existing yet. Skipping notification");
} }
} }
private void handleLargeNotification(RemoteMessage message) { private void handleLargeNotification(RemoteMessage message) {
String blobHash = message.getData().get(BLOB_HASH_KEY); String blobHash = message.getData().get(BLOB_HASH_KEY);
String blobHolder = message.getData().get(BLOB_HOLDER_KEY); String blobHolder = message.getData().get(BLOB_HOLDER_KEY);
try { try {
byte[] largePayload = blobClient.getBlobSync(blobHash); byte[] largePayload = servicesClient.getBlobSync(blobHash);
message = aesDecryptRemoteMessage(message, largePayload); message = aesDecryptRemoteMessage(message, largePayload);
handleMessageInfosPersistence(message); handleMessageInfosPersistence(message);
} catch (Exception e) { } catch (Exception e) {
Log.w("COMM", "Failure when handling large notification.", e); Log.w("COMM", "Failure when handling large notification.", e);
} }
blobClient.scheduleDeferredBlobDeletion( servicesClient.scheduleDeferredBlobDeletion(
blobHash, blobHolder, this.getApplicationContext()); blobHash, blobHolder, this.getApplicationContext());
} }
private void addToThreadGroupAndDisplay( private void addToThreadGroupAndDisplay(
String notificationID, String notificationID,
NotificationCompat.Builder notificationBuilder, NotificationCompat.Builder notificationBuilder,
String threadID) { String threadID) {
▲ Show 20 Lines • Show All 304 Lines • Show Last 20 Lines
View Options

lib/flow-typed/npm/@commapp/olm_vx.x.x.js

Show All 13 Lines
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.ProcessLifecycleOwner; import androidx.lifecycle.ProcessLifecycleOwner;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
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.aescrypto.AESCryptoModuleCompat; import app.comm.android.aescrypto.AESCryptoModuleCompat;
import app.comm.android.commservices.CommAndroidBlobClient; import app.comm.android.commservices.CommAndroidServicesClient;
import app.comm.android.fbjni.CommMMKV; import app.comm.android.fbjni.CommMMKV;
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.StaffUtils;
import app.comm.android.fbjni.ThreadOperations; import app.comm.android.fbjni.ThreadOperations;
Show All 33 Linespublic class CommNotificationsHandler extends FirebaseMessagingService {
// Those and future MMKV-related constants should match // Those and future MMKV-related constants should match
// similar constants in NotificationService.mm // similar constants in NotificationService.mm
private static final String MMKV_KEY_SEPARATOR = "."; private static final String MMKV_KEY_SEPARATOR = ".";
private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER"; private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER";
private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT"; private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT";
private Bitmap displayableNotificationLargeIcon; private Bitmap displayableNotificationLargeIcon;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
private CommAndroidBlobClient blobClient; private CommAndroidServicesClient servicesClient;
private AESCryptoModuleCompat aesCryptoModule; private AESCryptoModuleCompat aesCryptoModule;
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";
public static final String TITLE_KEY = "title"; public static final String TITLE_KEY = "title";
public static final String PREFIX_KEY = "prefix"; public static final String PREFIX_KEY = "prefix";
public static final String BODY_KEY = "body"; public static final String BODY_KEY = "body";
public static final String MESSAGE_INFOS_KEY = "messageInfos"; public static final String MESSAGE_INFOS_KEY = "messageInfos";
public static final String THREAD_ID_KEY = "threadID"; public static final String THREAD_ID_KEY = "threadID";
public static final String TOKEN_EVENT = "TOKEN_EVENT"; public static final String TOKEN_EVENT = "TOKEN_EVENT";
public static final String MESSAGE_EVENT = "MESSAGE_EVENT"; public static final String MESSAGE_EVENT = "MESSAGE_EVENT";
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
CommSecureStore.getInstance().initialize( CommSecureStore.getInstance().initialize(
ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext())); ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext()));
notificationManager = (NotificationManager)this.getSystemService( notificationManager = (NotificationManager)this.getSystemService(
Context.NOTIFICATION_SERVICE); Context.NOTIFICATION_SERVICE);
localBroadcastManager = LocalBroadcastManager.getInstance(this); localBroadcastManager = LocalBroadcastManager.getInstance(this);
displayableNotificationLargeIcon = BitmapFactory.decodeResource( displayableNotificationLargeIcon = BitmapFactory.decodeResource(
this.getApplicationContext().getResources(), R.mipmap.ic_launcher); this.getApplicationContext().getResources(), R.mipmap.ic_launcher);
blobClient = new CommAndroidBlobClient(); servicesClient = new CommAndroidServicesClient();
aesCryptoModule = new AESCryptoModuleCompat(); aesCryptoModule = new AESCryptoModuleCompat();
} }
@Override @Override
public void onNewToken(String token) { public void onNewToken(String token) {
Intent intent = new Intent(TOKEN_EVENT); Intent intent = new Intent(TOKEN_EVENT);
intent.putExtra("token", token); intent.putExtra("token", token);
localBroadcastManager.sendBroadcast(intent); localBroadcastManager.sendBroadcast(intent);
▲ Show 20 Lines • Show All 220 Lines • ▼ Show 20 Lines if (rawMessageInfosString != null && sqliteFile.exists()) {
Log.w("COMM", "Database not existing yet. Skipping notification"); Log.w("COMM", "Database not existing yet. Skipping notification");
} }
} }
private void handleLargeNotification(RemoteMessage message) { private void handleLargeNotification(RemoteMessage message) {
String blobHash = message.getData().get(BLOB_HASH_KEY); String blobHash = message.getData().get(BLOB_HASH_KEY);
String blobHolder = message.getData().get(BLOB_HOLDER_KEY); String blobHolder = message.getData().get(BLOB_HOLDER_KEY);
try { try {
byte[] largePayload = blobClient.getBlobSync(blobHash); byte[] largePayload = servicesClient.getBlobSync(blobHash);
message = aesDecryptRemoteMessage(message, largePayload); message = aesDecryptRemoteMessage(message, largePayload);
handleMessageInfosPersistence(message); handleMessageInfosPersistence(message);
} catch (Exception e) { } catch (Exception e) {
Log.w("COMM", "Failure when handling large notification.", e); Log.w("COMM", "Failure when handling large notification.", e);
} }
blobClient.scheduleDeferredBlobDeletion( servicesClient.scheduleDeferredBlobDeletion(
blobHash, blobHolder, this.getApplicationContext()); blobHash, blobHolder, this.getApplicationContext());
} }
private void addToThreadGroupAndDisplay( private void addToThreadGroupAndDisplay(
String notificationID, String notificationID,
NotificationCompat.Builder notificationBuilder, NotificationCompat.Builder notificationBuilder,
String threadID) { String threadID) {
▲ Show 20 Lines • Show All 304 Lines • Show Last 20 Lines
View Options

lib/package.json

Show All 13 Lines
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.ProcessLifecycleOwner; import androidx.lifecycle.ProcessLifecycleOwner;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
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.aescrypto.AESCryptoModuleCompat; import app.comm.android.aescrypto.AESCryptoModuleCompat;
import app.comm.android.commservices.CommAndroidBlobClient; import app.comm.android.commservices.CommAndroidServicesClient;
import app.comm.android.fbjni.CommMMKV; import app.comm.android.fbjni.CommMMKV;
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.StaffUtils;
import app.comm.android.fbjni.ThreadOperations; import app.comm.android.fbjni.ThreadOperations;
Show All 33 Linespublic class CommNotificationsHandler extends FirebaseMessagingService {
// Those and future MMKV-related constants should match // Those and future MMKV-related constants should match
// similar constants in NotificationService.mm // similar constants in NotificationService.mm
private static final String MMKV_KEY_SEPARATOR = "."; private static final String MMKV_KEY_SEPARATOR = ".";
private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER"; private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER";
private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT"; private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT";
private Bitmap displayableNotificationLargeIcon; private Bitmap displayableNotificationLargeIcon;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
private CommAndroidBlobClient blobClient; private CommAndroidServicesClient servicesClient;
private AESCryptoModuleCompat aesCryptoModule; private AESCryptoModuleCompat aesCryptoModule;
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";
public static final String TITLE_KEY = "title"; public static final String TITLE_KEY = "title";
public static final String PREFIX_KEY = "prefix"; public static final String PREFIX_KEY = "prefix";
public static final String BODY_KEY = "body"; public static final String BODY_KEY = "body";
public static final String MESSAGE_INFOS_KEY = "messageInfos"; public static final String MESSAGE_INFOS_KEY = "messageInfos";
public static final String THREAD_ID_KEY = "threadID"; public static final String THREAD_ID_KEY = "threadID";
public static final String TOKEN_EVENT = "TOKEN_EVENT"; public static final String TOKEN_EVENT = "TOKEN_EVENT";
public static final String MESSAGE_EVENT = "MESSAGE_EVENT"; public static final String MESSAGE_EVENT = "MESSAGE_EVENT";
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
CommSecureStore.getInstance().initialize( CommSecureStore.getInstance().initialize(
ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext())); ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext()));
notificationManager = (NotificationManager)this.getSystemService( notificationManager = (NotificationManager)this.getSystemService(
Context.NOTIFICATION_SERVICE); Context.NOTIFICATION_SERVICE);
localBroadcastManager = LocalBroadcastManager.getInstance(this); localBroadcastManager = LocalBroadcastManager.getInstance(this);
displayableNotificationLargeIcon = BitmapFactory.decodeResource( displayableNotificationLargeIcon = BitmapFactory.decodeResource(
this.getApplicationContext().getResources(), R.mipmap.ic_launcher); this.getApplicationContext().getResources(), R.mipmap.ic_launcher);
blobClient = new CommAndroidBlobClient(); servicesClient = new CommAndroidServicesClient();
aesCryptoModule = new AESCryptoModuleCompat(); aesCryptoModule = new AESCryptoModuleCompat();
} }
@Override @Override
public void onNewToken(String token) { public void onNewToken(String token) {
Intent intent = new Intent(TOKEN_EVENT); Intent intent = new Intent(TOKEN_EVENT);
intent.putExtra("token", token); intent.putExtra("token", token);
localBroadcastManager.sendBroadcast(intent); localBroadcastManager.sendBroadcast(intent);
▲ Show 20 Lines • Show All 220 Lines • ▼ Show 20 Lines if (rawMessageInfosString != null && sqliteFile.exists()) {
Log.w("COMM", "Database not existing yet. Skipping notification"); Log.w("COMM", "Database not existing yet. Skipping notification");
} }
} }
private void handleLargeNotification(RemoteMessage message) { private void handleLargeNotification(RemoteMessage message) {
String blobHash = message.getData().get(BLOB_HASH_KEY); String blobHash = message.getData().get(BLOB_HASH_KEY);
String blobHolder = message.getData().get(BLOB_HOLDER_KEY); String blobHolder = message.getData().get(BLOB_HOLDER_KEY);
try { try {
byte[] largePayload = blobClient.getBlobSync(blobHash); byte[] largePayload = servicesClient.getBlobSync(blobHash);
message = aesDecryptRemoteMessage(message, largePayload); message = aesDecryptRemoteMessage(message, largePayload);
handleMessageInfosPersistence(message); handleMessageInfosPersistence(message);
} catch (Exception e) { } catch (Exception e) {
Log.w("COMM", "Failure when handling large notification.", e); Log.w("COMM", "Failure when handling large notification.", e);
} }
blobClient.scheduleDeferredBlobDeletion( servicesClient.scheduleDeferredBlobDeletion(
blobHash, blobHolder, this.getApplicationContext()); blobHash, blobHolder, this.getApplicationContext());
} }
private void addToThreadGroupAndDisplay( private void addToThreadGroupAndDisplay(
String notificationID, String notificationID,
NotificationCompat.Builder notificationBuilder, NotificationCompat.Builder notificationBuilder,
String threadID) { String threadID) {
▲ Show 20 Lines • Show All 304 Lines • Show Last 20 Lines
View Options

native/package.json

Show All 13 Lines
import androidx.core.app.NotificationCompat; import androidx.core.app.NotificationCompat;
import androidx.lifecycle.Lifecycle; import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.ProcessLifecycleOwner; import androidx.lifecycle.ProcessLifecycleOwner;
import androidx.localbroadcastmanager.content.LocalBroadcastManager; import androidx.localbroadcastmanager.content.LocalBroadcastManager;
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.aescrypto.AESCryptoModuleCompat; import app.comm.android.aescrypto.AESCryptoModuleCompat;
import app.comm.android.commservices.CommAndroidBlobClient; import app.comm.android.commservices.CommAndroidServicesClient;
import app.comm.android.fbjni.CommMMKV; import app.comm.android.fbjni.CommMMKV;
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.StaffUtils;
import app.comm.android.fbjni.ThreadOperations; import app.comm.android.fbjni.ThreadOperations;
Show All 33 Linespublic class CommNotificationsHandler extends FirebaseMessagingService {
// Those and future MMKV-related constants should match // Those and future MMKV-related constants should match
// similar constants in NotificationService.mm // similar constants in NotificationService.mm
private static final String MMKV_KEY_SEPARATOR = "."; private static final String MMKV_KEY_SEPARATOR = ".";
private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER"; private static final String MMKV_KEYSERVER_PREFIX = "KEYSERVER";
private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT"; private static final String MMKV_UNREAD_COUNT_SUFFIX = "UNREAD_COUNT";
private Bitmap displayableNotificationLargeIcon; private Bitmap displayableNotificationLargeIcon;
private NotificationManager notificationManager; private NotificationManager notificationManager;
private LocalBroadcastManager localBroadcastManager; private LocalBroadcastManager localBroadcastManager;
private CommAndroidBlobClient blobClient; private CommAndroidServicesClient servicesClient;
private AESCryptoModuleCompat aesCryptoModule; private AESCryptoModuleCompat aesCryptoModule;
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";
public static final String TITLE_KEY = "title"; public static final String TITLE_KEY = "title";
public static final String PREFIX_KEY = "prefix"; public static final String PREFIX_KEY = "prefix";
public static final String BODY_KEY = "body"; public static final String BODY_KEY = "body";
public static final String MESSAGE_INFOS_KEY = "messageInfos"; public static final String MESSAGE_INFOS_KEY = "messageInfos";
public static final String THREAD_ID_KEY = "threadID"; public static final String THREAD_ID_KEY = "threadID";
public static final String TOKEN_EVENT = "TOKEN_EVENT"; public static final String TOKEN_EVENT = "TOKEN_EVENT";
public static final String MESSAGE_EVENT = "MESSAGE_EVENT"; public static final String MESSAGE_EVENT = "MESSAGE_EVENT";
@Override @Override
public void onCreate() { public void onCreate() {
super.onCreate(); super.onCreate();
CommSecureStore.getInstance().initialize( CommSecureStore.getInstance().initialize(
ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext())); ExpoUtils.createExpoSecureStoreSupplier(this.getApplicationContext()));
notificationManager = (NotificationManager)this.getSystemService( notificationManager = (NotificationManager)this.getSystemService(
Context.NOTIFICATION_SERVICE); Context.NOTIFICATION_SERVICE);
localBroadcastManager = LocalBroadcastManager.getInstance(this); localBroadcastManager = LocalBroadcastManager.getInstance(this);
displayableNotificationLargeIcon = BitmapFactory.decodeResource( displayableNotificationLargeIcon = BitmapFactory.decodeResource(
this.getApplicationContext().getResources(), R.mipmap.ic_launcher); this.getApplicationContext().getResources(), R.mipmap.ic_launcher);
blobClient = new CommAndroidBlobClient(); servicesClient = new CommAndroidServicesClient();
aesCryptoModule = new AESCryptoModuleCompat(); aesCryptoModule = new AESCryptoModuleCompat();
} }
@Override @Override
public void onNewToken(String token) { public void onNewToken(String token) {
Intent intent = new Intent(TOKEN_EVENT); Intent intent = new Intent(TOKEN_EVENT);
intent.putExtra("token", token); intent.putExtra("token", token);
localBroadcastManager.sendBroadcast(intent); localBroadcastManager.sendBroadcast(intent);
▲ Show 20 Lines • Show All 220 Lines • ▼ Show 20 Lines if (rawMessageInfosString != null && sqliteFile.exists()) {
Log.w("COMM", "Database not existing yet. Skipping notification"); Log.w("COMM", "Database not existing yet. Skipping notification");
} }
} }
private void handleLargeNotification(RemoteMessage message) { private void handleLargeNotification(RemoteMessage message) {
String blobHash = message.getData().get(BLOB_HASH_KEY); String blobHash = message.getData().get(BLOB_HASH_KEY);
String blobHolder = message.getData().get(BLOB_HOLDER_KEY); String blobHolder = message.getData().get(BLOB_HOLDER_KEY);
try { try {
byte[] largePayload = blobClient.getBlobSync(blobHash); byte[] largePayload = servicesClient.getBlobSync(blobHash);
message = aesDecryptRemoteMessage(message, largePayload); message = aesDecryptRemoteMessage(message, largePayload);
handleMessageInfosPersistence(message); handleMessageInfosPersistence(message);
} catch (Exception e) { } catch (Exception e) {
Log.w("COMM", "Failure when handling large notification.", e); Log.w("COMM", "Failure when handling large notification.", e);
} }
blobClient.scheduleDeferredBlobDeletion( servicesClient.scheduleDeferredBlobDeletion(
blobHash, blobHolder, this.getApplicationContext()); blobHash, blobHolder, this.getApplicationContext());
} }
private void addToThreadGroupAndDisplay( private void addToThreadGroupAndDisplay(
String notificationID, String notificationID,
NotificationCompat.Builder notificationBuilder, NotificationCompat.Builder notificationBuilder,
String threadID) { String threadID) {
▲ Show 20 Lines • Show All 304 Lines • Show Last 20 Lines
View Options

web/flow-typed/npm/@commapp/olm_vx.x.x.js

Loading...
View Options

web/package.json

Loading...
View Options

yarn.lock

Loading...