Page MenuHomePhabricator
Differential D13681

[native] Fix Timestamp position when focusing RobotextMessage with InlineEngagement
ClosedPublic
Actions

Authored by ashoat on Oct 9 2024, 8:28 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Apr 6, 7:33 AM
Unknown Object (File)
Thu, Apr 3, 11:21 PM
Unknown Object (File)
Mon, Mar 31, 6:22 AM
Unknown Object (File)
Sat, Mar 15, 3:17 AM
Unknown Object (File)
Feb 17 2025, 11:18 AM
Unknown Object (File)
Feb 17 2025, 11:18 AM
Unknown Object (File)
Feb 17 2025, 11:17 AM
Unknown Object (File)
Feb 17 2025, 11:17 AM
View All 54 Files
Subscribers
None

Details

Reviewers
tomek
Commits
rCOMM4de9b10a1c92: [native] Fix Timestamp position when focusing RobotextMessage with…
Summary

We shouldn't include the InlineEngagement in the View that gets measured. By removing this, I fixed a visual glitch where the Timestamp for a robotext message would jump higher on the screen when the robotext was selected.

Depends on D13680

Test Plan
  1. I reacted to a robotext where the timestamp was already showing. Then I pressed it, and made sure there were no visual glitches or logs about incorrect height
  2. Same as above, except where the timestamp wasn't showing

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
native/
chat/
2 lines
2 lines

Diff 45122

View Options

native/chat/composed-message.react.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

native/chat/robotext-message.react.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