Merge branch 'RocketChat:develop' into develop

Author: divyanshu-patil

android/app/src/main/java/chat/rocket/reactnative/MainActivity.kt

@@ -9,9 +9,7 @@ import android.os.Bundle
 import com.zoontek.rnbootsplash.RNBootSplash
 import android.content.Intent
 import android.content.res.Configuration
-import chat.rocket.reactnative.notification.VideoConfModule
-import chat.rocket.reactnative.notification.VideoConfNotification
-import com.google.gson.GsonBuilder
+import chat.rocket.reactnative.notification.NotificationIntentHandler
 
 class MainActivity : ReactActivity() {
 
@@ -32,56 +30,16 @@ class MainActivity : ReactActivity() {
     RNBootSplash.init(this, R.style.BootTheme)
     super.onCreate(null)
 
-    // Handle video conf action from notification
-    intent?.let { handleVideoConfIntent(it) }
+    // Handle notification intents
+    intent?.let { NotificationIntentHandler.handleIntent(this, it) }
   }
 
   public override fun onNewIntent(intent: Intent) {
     super.onNewIntent(intent)
-    // Handle video conf action when activity is already running
-    handleVideoConfIntent(intent)
-  }
-  
-  private fun handleVideoConfIntent(intent: Intent) {
-    if (intent.getBooleanExtra("videoConfAction", false)) {
-      val notificationId = intent.getIntExtra("notificationId", 0)
-      val event = intent.getStringExtra("event") ?: return
-      val rid = intent.getStringExtra("rid") ?: ""
-      val callerId = intent.getStringExtra("callerId") ?: ""
-      val callerName = intent.getStringExtra("callerName") ?: ""
-      val host = intent.getStringExtra("host") ?: ""
-      val callId = intent.getStringExtra("callId") ?: ""
-      
-      android.util.Log.d("RocketChat.MainActivity", "Handling video conf intent - event: $event, rid: $rid, host: $host, callId: $callId")
-      
-      // Cancel the notification
-      if (notificationId != 0) {
-        VideoConfNotification.cancelById(this, notificationId)
-      }
-      
-      // Store action for JS to pick up - include all required fields
-      val data = mapOf(
-        "notificationType" to "videoconf",
-        "rid" to rid,
-        "event" to event,
-        "host" to host,
-        "callId" to callId,
-        "caller" to mapOf(
-          "_id" to callerId,
-          "name" to callerName
-        )
-      )
-      
-      val gson = GsonBuilder().create()
-      val jsonData = gson.toJson(data)
-      
-      android.util.Log.d("RocketChat.MainActivity", "Storing video conf action: $jsonData")
-      
-      VideoConfModule.storePendingAction(this, jsonData)
-      
-      // Clear the video conf flag to prevent re-processing
-      intent.removeExtra("videoConfAction")
-    }
+    setIntent(intent)
+    
+    // Handle notification intents when activity is already running
+    NotificationIntentHandler.handleIntent(this, intent)
   }
 
   override fun invokeDefaultOnBackPressed() {

android/app/src/main/java/chat/rocket/reactnative/MainApplication.kt

@@ -5,11 +5,8 @@ import android.content.res.Configuration
 import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactHost
-import com.facebook.react.ReactInstanceEventListener
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.load
 import com.facebook.react.defaults.DefaultReactHost.getDefaultReactHost
 import com.facebook.react.defaults.DefaultReactNativeHost
@@ -21,8 +18,8 @@ import expo.modules.ApplicationLifecycleDispatcher
 import chat.rocket.reactnative.networking.SSLPinningTurboPackage;
 import chat.rocket.reactnative.storage.MMKVKeyManager;
 import chat.rocket.reactnative.storage.SecureStoragePackage;
-import chat.rocket.reactnative.notification.CustomPushNotification;
 import chat.rocket.reactnative.notification.VideoConfTurboPackage
+import chat.rocket.reactnative.notification.PushNotificationTurboPackage
 
 /**
  * Main Application class.
@@ -45,6 +42,7 @@ open class MainApplication : Application(), ReactApplication {
               add(SSLPinningTurboPackage())
               add(WatermelonDBJSIPackage())
               add(VideoConfTurboPackage())
+              add(PushNotificationTurboPackage())
               add(SecureStoragePackage())
             }
 
@@ -71,13 +69,6 @@ open class MainApplication : Application(), ReactApplication {
     // Load the native entry point for the New Architecture
     load()
 
-    // Register listener to set React context when initialized
-    reactHost.addReactInstanceEventListener(object : ReactInstanceEventListener {
-      override fun onReactContextInitialized(context: ReactContext) {
-        CustomPushNotification.setReactContext(context as ReactApplicationContext)
-      }
-    })
-    
 		ApplicationLifecycleDispatcher.onApplicationCreate(this)
   }
 

android/app/src/main/java/chat/rocket/reactnative/notification/CustomPushNotification.java

@@ -18,7 +18,6 @@
 
 import androidx.annotation.Nullable;
 
-import com.facebook.react.bridge.ReactApplicationContext;
 import com.google.gson.Gson;
 
 import java.util.ArrayList;
@@ -43,7 +42,6 @@ public class CustomPushNotification {
     private static final boolean ENABLE_VERBOSE_LOGS = BuildConfig.DEBUG;
 
     // Shared state
-    public static volatile ReactApplicationContext reactApplicationContext;
     private static final Gson gson = new Gson();
     private static final Map<String, List<Bundle>> notificationMessages = new ConcurrentHashMap<>();
 
@@ -67,25 +65,10 @@ public CustomPushNotification(Context context, Bundle bundle) {
         createNotificationChannel();
     }
 
-    /**
-     * Sets the React application context when React Native initializes.
-     * Called from MainApplication when React context is ready.
-     */
-    public static void setReactContext(ReactApplicationContext context) {
-        reactApplicationContext = context;
-    }
-
     public static void clearMessages(int notId) {
         notificationMessages.remove(Integer.toString(notId));
     }
 
-    /**
-     * Check if React Native is initialized
-     */
-    private boolean isReactInitialized() {
-        return reactApplicationContext != null;
-    }
-
     public void onReceived() {
         String notId = mBundle.getString("notId");
 
@@ -101,64 +84,18 @@ public void onReceived() {
             return;
         }
 
-        // Check if React is ready - needed for MMKV access (avatars, encryption, message-id-only)
-        if (!isReactInitialized()) {
-            Log.w(TAG, "React not initialized yet, waiting before processing notification...");
-            
-            // Wait for React to initialize with timeout
-            new Thread(() -> {
-                int attempts = 0;
-                int maxAttempts = 50; // 5 seconds total (50 * 100ms)
-                
-                while (!isReactInitialized() && attempts < maxAttempts) {
-                    try {
-                        Thread.sleep(100); // Wait 100ms
-                        attempts++;
-                        
-                        if (attempts % 10 == 0 && ENABLE_VERBOSE_LOGS) {
-                            Log.d(TAG, "Still waiting for React initialization... (" + (attempts * 100) + "ms elapsed)");
-                        }
-                    } catch (InterruptedException e) {
-                        Log.e(TAG, "Wait interrupted", e);
-                        Thread.currentThread().interrupt();
-                        return;
-                    }
-                }
-                
-                if (isReactInitialized()) {
-                    Log.i(TAG, "React initialized after " + (attempts * 100) + "ms, proceeding with notification");
-                    try {
-                        handleNotification();
-                    } catch (Exception e) {
-                        Log.e(TAG, "Failed to process notification after React initialization", e);
-                    }
-                } else {
-                    Log.e(TAG, "Timeout waiting for React initialization after " + (maxAttempts * 100) + "ms, processing without MMKV");
-                    try {
-                        handleNotification();
-                    } catch (Exception e) {
-                        Log.e(TAG, "Failed to process notification without React context", e);
-                    }
-                }
-            }).start();
-            
-            return; // Exit early, notification will be processed in the thread
-        }
-        
-        if (ENABLE_VERBOSE_LOGS) {
-            Log.d(TAG, "React already initialized, proceeding with notification");
-        }
-        
+        // Process notification immediately - no need to wait for React Native
+        // MMKV is initialized at app startup, so all notification types can work without React
         try {
             handleNotification();
         } catch (Exception e) {
-            Log.e(TAG, "Failed to process notification on main thread", e);
+            Log.e(TAG, "Failed to process notification", e);
         }
     }
 
     private void handleNotification() {
         Ejson receivedEjson = safeFromJson(mBundle.getString("ejson", "{}"), Ejson.class);
-
+        
         if (receivedEjson != null && receivedEjson.notificationType != null && receivedEjson.notificationType.equals("message-id-only")) {
             Log.d(TAG, "Detected message-id-only notification, will fetch full content from server");
             loadNotificationAndProcess(receivedEjson);
@@ -210,7 +147,7 @@ private void processNotification() {
         // Handle E2E encrypted notifications
         if (isE2ENotification(loadedEjson)) {
             handleE2ENotification(mBundle, loadedEjson, notId);
-            return; // E2E processor will handle showing the notification
+            return; // handleE2ENotification will decrypt and show the notification
         }
 
         // Handle regular (non-E2E) notifications
@@ -225,54 +162,30 @@ private boolean isE2ENotification(Ejson ejson) {
     }
 
     /**
-     * Handles E2E encrypted notifications by delegating to the async processor.
+     * Handles E2E encrypted notifications by decrypting immediately using regular Android Context.
+     * No longer waits for React Native initialization.
      */
     private void handleE2ENotification(Bundle bundle, Ejson ejson, String notId) {
-        // Check if React context is immediately available
-        if (reactApplicationContext != null) {
-            // Fast path: decrypt immediately
-            String decrypted = Encryption.shared.decryptMessage(ejson, reactApplicationContext);
-            
-            if (decrypted != null) {
-                bundle.putString("message", decrypted);
+        // Decrypt immediately using regular Android Context (mContext)
+        // This works without React Native initialization
+        String decrypted = Encryption.shared.decryptMessage(ejson, mContext);
+        
+        if (decrypted != null) {
+            bundle.putString("message", decrypted);
+            synchronized(this) {
                 mBundle = bundle;
-                ejson = safeFromJson(bundle.getString("ejson", "{}"), Ejson.class);
-                showNotification(bundle, ejson, notId);
-            } else {
-                Log.w(TAG, "E2E decryption failed for notification");
             }
-            return;
-        }
-        
-        // Slow path: wait for React context asynchronously
-        Log.i(TAG, "Waiting for React context to decrypt E2E notification");
-        
-        E2ENotificationProcessor processor = new E2ENotificationProcessor(
-            // Context provider
-            () -> reactApplicationContext,
-            
-            // Callback
-            new E2ENotificationProcessor.NotificationCallback() {
-                @Override
-                public void onDecryptionComplete(Bundle decryptedBundle, Ejson decryptedEjson, String notificationId) {
-                    mBundle = decryptedBundle;
-                    Ejson finalEjson = safeFromJson(decryptedBundle.getString("ejson", "{}"), Ejson.class);
-                    showNotification(decryptedBundle, finalEjson, notificationId);
-                }
-                
-                @Override
-                public void onDecryptionFailed(Bundle originalBundle, Ejson originalEjson, String notificationId) {
-                    Log.w(TAG, "E2E decryption failed for notification");
-                }
-                
-                @Override
-                public void onTimeout(Bundle originalBundle, Ejson originalEjson, String notificationId) {
-                    Log.w(TAG, "Timeout waiting for React context for E2E notification");
-                }
+            showNotification(bundle, ejson, notId);
+        } else {
+            Log.w(TAG, "E2E decryption failed for notification, showing fallback notification");
+            // Show fallback notification so user knows a message arrived
+            // Use a placeholder message since we can't decrypt
+            bundle.putString("message", "Encrypted message");
+            synchronized(this) {
+                mBundle = bundle;
             }
-        );
-        
-        processor.processAsync(bundle, ejson, notId);
+            showNotification(bundle, ejson, notId);
+        }
     }
 
     /**
@@ -289,13 +202,23 @@ private void showNotification(Bundle bundle, Ejson ejson, String notId) {
         boolean hasSender = ejson != null && ejson.sender != null;
         String title = bundle.getString("title");
 
+        String displaySenderName = (ejson != null && ejson.senderName != null && !ejson.senderName.isEmpty())
+                ? ejson.senderName
+                : (hasSender ? ejson.sender.username : title);
+
         bundle.putLong("time", new Date().getTime());
-        bundle.putString("username", hasSender ? ejson.sender.username : title);
+        bundle.putString("username", displaySenderName);
         bundle.putString("senderId", hasSender ? ejson.sender._id : "1");
 
         String avatarUri = ejson != null ? ejson.getAvatarUri() : null;
         bundle.putString("avatarUri", avatarUri);
 
+        // Ensure mBundle is updated with all modifications before building notification
+        // This ensures buildNotification() sees the complete bundle with all fields (including ejson)
+        synchronized(this) {
+            mBundle = bundle;
+        }
+
         // Handle special notification types
         if (ejson != null && "videoconf".equals(ejson.notificationType)) {
             handleVideoConfNotification(bundle, ejson);
@@ -372,19 +295,6 @@ private Notification.Builder buildNotification(int notificationId) {
 
         // Determine the correct title based on notification type
         String notificationTitle = title;
-        if (ejson != null && ejson.type != null) {
-            if ("p".equals(ejson.type) || "c".equals(ejson.type)) {
-                // For groups/channels, use room name if available, otherwise fall back to title
-                notificationTitle = (ejson.name != null && !ejson.name.isEmpty()) ? ejson.name : title;
-            } else if ("d".equals(ejson.type)) {
-                // For direct messages, use title (sender name from server)
-                notificationTitle = title;
-            } else if ("l".equals(ejson.type)) {
-                // For omnichannel, use sender name if available, otherwise fall back to title
-                notificationTitle = (ejson.sender != null && ejson.sender.name != null && !ejson.sender.name.isEmpty()) 
-                    ? ejson.sender.name : title;
-            }
-        }
 
         if (ENABLE_VERBOSE_LOGS) {
             Log.d(TAG, "[buildNotification] notId=" + notId);
@@ -546,19 +456,6 @@ private void notificationStyle(Notification.Builder notification, int notId, Bun
             // Determine the correct conversation title based on notification type
             Ejson bundleEjson = safeFromJson(bundle.getString("ejson", "{}"), Ejson.class);
             String conversationTitle = title;
-            if (bundleEjson != null && bundleEjson.type != null) {
-                if ("p".equals(bundleEjson.type) || "c".equals(bundleEjson.type)) {
-                    // For groups/channels, use room name if available, otherwise fall back to title
-                    conversationTitle = (bundleEjson.name != null && !bundleEjson.name.isEmpty()) ? bundleEjson.name : title;
-                } else if ("d".equals(bundleEjson.type)) {
-                    // For direct messages, use title (sender name from server)
-                    conversationTitle = title;
-                } else if ("l".equals(bundleEjson.type)) {
-                    // For omnichannel, use sender name if available, otherwise fall back to title
-                    conversationTitle = (bundleEjson.sender != null && bundleEjson.sender.name != null && !bundleEjson.sender.name.isEmpty()) 
-                        ? bundleEjson.sender.name : title;
-                }
-            }
             messageStyle.setConversationTitle(conversationTitle);
 
             if (bundles != null) {
@@ -570,15 +467,17 @@ private void notificationStyle(Notification.Builder notification, int notId, Bun
                     Ejson ejson = safeFromJson(data.getString("ejson", "{}"), Ejson.class);
                     String m = extractMessage(message, ejson);
 
+                    String displaySenderName = (ejson != null && ejson.senderName != null && !ejson.senderName.isEmpty())
+                            ? ejson.senderName
+                            : (ejson != null && ejson.sender != null ? ejson.sender.username : title);
+
                     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.P) {
-                        String senderName = ejson != null ? ejson.senderName : "Unknown";
-                        messageStyle.addMessage(m, timestamp, senderName);
+                        messageStyle.addMessage(m, timestamp, displaySenderName);
                     } else {
                         Bitmap avatar = getAvatar(avatarUri);
-                        String senderName = ejson != null ? ejson.senderName : "Unknown";
                         Person.Builder senderBuilder = new Person.Builder()
                                 .setKey(senderId)
-                                .setName(senderName);
+                                .setName(displaySenderName);
 
                         if (avatar != null) {
                             senderBuilder.setIcon(Icon.createWithBitmap(avatar));