Merge pull request #2111 from OneSignal/fix/group_notifications_ctr

Fix: Update onNotificationOpened to process each notification ID

Author: jennantilla

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/lifecycle/INotificationLifecycleEventHandler.kt

@@ -13,6 +13,5 @@ interface INotificationLifecycleEventHandler {
     suspend fun onNotificationOpened(
         activity: Activity,
         data: JSONArray,
-        notificationId: String,
     )
 }

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/lifecycle/INotificationLifecycleService.kt

@@ -69,6 +69,5 @@ interface INotificationLifecycleService {
     suspend fun notificationOpened(
         activity: Activity,
         data: JSONArray,
-        notificationId: String,
     )
 }

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/lifecycle/impl/NotificationLifecycleService.kt

@@ -95,9 +95,8 @@ internal class NotificationLifecycleService(
     override suspend fun notificationOpened(
         activity: Activity,
         data: JSONArray,
-        notificationId: String,
     ) {
-        intLifecycleHandler.suspendingFire { it.onNotificationOpened(activity, data, notificationId) }
+        intLifecycleHandler.suspendingFire { it.onNotificationOpened(activity, data) }
 
         // queue up the opened notification in case the handler hasn't been set yet. Once set,
         // we will immediately fire the handler.

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/listeners/NotificationListener.kt

@@ -14,6 +14,7 @@ import com.onesignal.notifications.internal.INotificationActivityOpener
 import com.onesignal.notifications.internal.analytics.IAnalyticsTracker
 import com.onesignal.notifications.internal.backend.INotificationBackendService
 import com.onesignal.notifications.internal.common.NotificationConstants
+import com.onesignal.notifications.internal.common.NotificationFormatHelper
 import com.onesignal.notifications.internal.common.NotificationGenerationJob
 import com.onesignal.notifications.internal.common.NotificationHelper
 import com.onesignal.notifications.internal.common.OSNotificationOpenAppSettings
@@ -67,17 +68,19 @@ internal class NotificationListener(
     override suspend fun onNotificationOpened(
         activity: Activity,
         data: JSONArray,
-        notificationId: String,
     ) {
         val config = _configModelStore.model
         val appId: String = config.appId ?: ""
         val subscriptionId: String = _subscriptionManager.subscriptions.push.id
         val deviceType = _deviceService.deviceType
 
         for (i in 0 until data.length()) {
+            val notificationId = NotificationFormatHelper.getOSNotificationIdFromJson(data[i] as JSONObject?) ?: continue
+
             if (postedOpenedNotifIds.contains(notificationId)) {
                 continue
             }
+
             postedOpenedNotifIds.add(notificationId)
 
             try {
@@ -98,10 +101,15 @@ internal class NotificationListener(
             NotificationHelper.getCampaignNameFromNotification(openResult.notification),
         )
 
+        // Handle the first element in the data array as the latest notification
+        val latestNotificationId = getLatestNotificationId(data)
+
         if (shouldInitDirectSessionFromNotificationOpen(activity)) {
             // We want to set the app entry state to NOTIFICATION_CLICK when coming from background
             _applicationService.entryState = AppEntryAction.NOTIFICATION_CLICK
-            _influenceManager.onDirectInfluenceFromNotification(notificationId)
+            if (latestNotificationId != null) {
+                _influenceManager.onDirectInfluenceFromNotification(latestNotificationId)
+            }
         }
 
         _activityOpener.openDestinationActivity(activity, data)
@@ -119,4 +127,9 @@ internal class NotificationListener(
         }
         return true
     }
+
+    private fun getLatestNotificationId(data: JSONArray): String? {
+        val latestNotification = if (data.length() > 0) data[0] as JSONObject else null
+        return NotificationFormatHelper.getOSNotificationIdFromJson(latestNotification)
+    }
 }

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/open/impl/NotificationOpenedProcessor.kt

@@ -38,7 +38,6 @@ import com.onesignal.core.internal.config.ConfigModelStore
 import com.onesignal.core.internal.database.impl.OneSignalDbContract
 import com.onesignal.debug.internal.logging.Logging
 import com.onesignal.notifications.internal.common.NotificationConstants
-import com.onesignal.notifications.internal.common.NotificationFormatHelper
 import com.onesignal.notifications.internal.common.NotificationHelper
 import com.onesignal.notifications.internal.data.INotificationRepository
 import com.onesignal.notifications.internal.lifecycle.INotificationLifecycleService
@@ -131,7 +130,6 @@ internal class NotificationOpenedProcessor(
                 _lifecycleService.notificationOpened(
                     context,
                     intentExtras!!.dataArray,
-                    NotificationFormatHelper.getOSNotificationIdFromJson(intentExtras.jsonData)!!,
                 )
             }
         }

OneSignalSDK/onesignal/notifications/src/main/java/com/onesignal/notifications/internal/open/impl/NotificationOpenedProcessorHMS.kt

@@ -66,7 +66,6 @@ internal class NotificationOpenedProcessorHMS(
         _lifecycleService.notificationOpened(
             activity,
             JSONUtils.wrapInJsonArray(jsonData),
-            NotificationFormatHelper.getOSNotificationIdFromJson(jsonData)!!,
         )
     }
 }