Merge branch 'develop' into test.poc-a11y-bottom-shet

Author: OtavioStasiak

android/app/build.gradle

@@ -152,6 +152,9 @@ dependencies {
 
     // For SecureKeystore (EncryptedSharedPreferences)
     implementation 'androidx.security:security-crypto:1.1.0'
+
+    // For ProcessLifecycleOwner (app foreground detection)
+    implementation 'androidx.lifecycle:lifecycle-process:2.8.7'
 }
 
 apply plugin: 'com.google.gms.google-services'

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

@@ -17,6 +17,8 @@
 import android.util.Log;
 
 import androidx.annotation.Nullable;
+import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.ProcessLifecycleOwner;
 
 import com.google.gson.Gson;
 
@@ -68,6 +70,14 @@ public CustomPushNotification(Context context, Bundle bundle) {
     public static void clearMessages(int notId) {
         notificationMessages.remove(Integer.toString(notId));
     }
+
+    /**
+     * Checks if the app is currently in the foreground.
+     * Uses ProcessLifecycleOwner to reliably detect app state.
+     */
+    public static boolean isAppInForeground() {
+        return ProcessLifecycleOwner.get().getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED);
+    }
 
     public void onReceived() {
         String notId = mBundle.getString("notId");
@@ -228,6 +238,15 @@ private void showNotification(Bundle bundle, Ejson ejson, String notId) {
             if (ENABLE_VERBOSE_LOGS) {
                 Log.d(TAG, "[Before add to notificationMessages] notId=" + notId + ", bundle.message length=" + (bundle.getString("message") != null ? bundle.getString("message").length() : 0) + ", bundle.notificationLoaded=" + bundle.getBoolean("notificationLoaded", false));
             }
+
+            // Don't show notification if app is in foreground
+            if (isAppInForeground()) {
+                if (ENABLE_VERBOSE_LOGS) {
+                    Log.d(TAG, "App is in foreground, skipping native notification");
+                }
+                return;
+            }
+
             notificationMessages.get(notId).add(bundle);
             if (ENABLE_VERBOSE_LOGS) {
                 Log.d(TAG, "[After add] notificationMessages[" + notId + "].size=" + notificationMessages.get(notId).size());