Code simplification updates

- replace notificationId null check with early continue
- create private helper method for getting latest notification Id

Author: jennantilla

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

@@ -75,23 +75,21 @@ internal class NotificationListener(
         val deviceType = _deviceService.deviceType
 
         for (i in 0 until data.length()) {
-            val notificationId = NotificationFormatHelper.getOSNotificationIdFromJson(data[i] as JSONObject?)
+            val notificationId = NotificationFormatHelper.getOSNotificationIdFromJson(data[i] as JSONObject?) ?: continue
+
             if (postedOpenedNotifIds.contains(notificationId)) {
                 continue
             }
-            if (notificationId != null) {
-                postedOpenedNotifIds.add(notificationId)
-            }
+
+            postedOpenedNotifIds.add(notificationId)
 
             try {
-                if (notificationId != null) {
-                    _backend.updateNotificationAsOpened(
-                        appId,
-                        notificationId,
-                        subscriptionId,
-                        deviceType,
-                    )
-                }
+                _backend.updateNotificationAsOpened(
+                    appId,
+                    notificationId,
+                    subscriptionId,
+                    deviceType,
+                )
             } catch (ex: BackendException) {
                 Logging.error("Notification opened confirmation failed with statusCode: ${ex.statusCode} response: ${ex.response}")
             }
@@ -104,8 +102,7 @@ internal class NotificationListener(
         )
 
         // Handle the first element in the data array as the latest notification
-        val latestNotification = if (data.length() > 0) data[0] as JSONObject else null
-        val latestNotificationId = NotificationFormatHelper.getOSNotificationIdFromJson(latestNotification)
+        val latestNotificationId = getLatestNotificationId(data)
 
         if (shouldInitDirectSessionFromNotificationOpen(activity)) {
             // We want to set the app entry state to NOTIFICATION_CLICK when coming from background
@@ -130,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