recover from invalid Operations missing onesignalId

* When uncaching an Operation that is not login-related, check for the existence of onesignalId.
* Note: The login-related Operations should still have onesignalId but they can be sent without it. It is also less likely for onesignalId to be null based on when these Operations are created.
* This is to remedy a rare case that an Operation could be missing the onesignalId, which would continuously cause crashes when the Operation is processed. The particular reported Operation is an UpdateSubscriptionOperation.

Author: nan-li

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/core/internal/operations/impl/OperationModelStore.kt

@@ -38,8 +38,7 @@ internal class OperationModelStore(prefs: IPreferencesService) : ModelStore<Oper
             return null
         }
 
-        if (!jsonObject.has(Operation::name.name)) {
-            Logging.error("jsonObject must have '${Operation::name.name}' attribute")
+        if (!isValidOperation(jsonObject)) {
             return null
         }
 
@@ -69,4 +68,34 @@ internal class OperationModelStore(prefs: IPreferencesService) : ModelStore<Oper
 
         return operation
     }
+
+    /**
+     * Checks if a JSONObject is a valid Operation. Contains a check for onesignalId.
+     * This is a rare case that a cached Operation is missing the onesignalId,
+     * which would continuously cause crashes when the Operation is processed.
+     *
+     * @param jsonObject The [JSONObject] that represents an Operation
+     */
+    private fun isValidOperation(jsonObject: JSONObject): Boolean {
+        if (!jsonObject.has(Operation::name.name)) {
+            Logging.error("jsonObject must have '${Operation::name.name}' attribute")
+            return false
+        }
+
+        val operationName = jsonObject.getString(Operation::name.name)
+
+        val excluded =
+            setOf(
+                LoginUserOperationExecutor.LOGIN_USER,
+                LoginUserFromSubscriptionOperationExecutor.LOGIN_USER_FROM_SUBSCRIPTION_USER,
+            )
+
+        // Must have onesignalId if it is not one of the excluded operations above
+        if (!jsonObject.has("onesignalId") && !excluded.contains(operationName)) {
+            Logging.error("$operationName jsonObject must have 'onesignalId' attribute")
+            return false
+        }
+
+        return true
+    }
 }