Preserve existingOnesignalId when deduping LoginUserOperation

When dedupe fires, the existing queued op came from
RecoverFromDroppedLoginBug (always has existingOnesignalId=null) and
the incoming op from enqueueLogin may carry the anonymous user's
UUID needed to merge their tags/subscriptions into the newly-
identified user. Previously the dedupe kept whichever op was first,
silently dropping the merge info when the recovery op won the race.

Merge the incoming op's existingOnesignalId into the queued op in
place before dropping the duplicate. LoginUserOperation.existingOnesignalId
setter relaxed from private to internal to allow the in-place update.

Also initialize the LoginUserOperations in the loadSavedOperations
test properly — the old dedupe only compared ids so uninitialized
ops worked incidentally; the new dedupe reads onesignalId.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: nan-li

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

@@ -162,25 +162,29 @@ internal class OperationRepo(
                 return
             }
 
-            // Dedupe LoginUserOperation for the same user — prevents RecoverFromDroppedLoginBug
-            // and the real login() call from both enqueuing a login op during the timing window.
-            // Wake the waiter optimistically with `true`: the already-queued op will do the work,
-            // but we don't await its real result (that would require waiter chaining). enqueueAndWait
-            // callers like loginSuspend would otherwise hang forever. The only caller today is
-            // LoginHelper.enqueueLogin which just logs on failure, so the lost signal is acceptable.
-            // If the op came from loadSavedOperations (addToStore = false) it's also a stale
-            // duplicate in the store; remove it to avoid an orphan entry that lingers until the
-            // next cold start.
+            // Dedupe LoginUserOperation for the same user. Merge the incoming
+            // existingOnesignalId in so the anon-user conversion isn't lost when
+            // RecoverFromDroppedLoginBug wins the race (it enqueues with null).
             val op = queueItem.operation
-            if (op is LoginUserOperation &&
-                queue.any { it.operation is LoginUserOperation && it.operation.onesignalId == op.onesignalId }
-            ) {
-                Logging.debug("OperationRepo: internalEnqueue - LoginUserOperation for onesignalId: ${op.onesignalId} already exists in the queue.")
-                if (!addToStore) {
-                    _operationModelStore.remove(queueItem.operation.id)
+            if (op is LoginUserOperation) {
+                val existing =
+                    queue.firstOrNull {
+                        it.operation is LoginUserOperation && it.operation.onesignalId == op.onesignalId
+                    }
+                if (existing != null) {
+                    val existingOp = existing.operation as LoginUserOperation
+                    if (op.existingOnesignalId != null && existingOp.existingOnesignalId == null) {
+                        Logging.debug("OperationRepo: internalEnqueue - merged existingOnesignalId=${op.existingOnesignalId} into queued LoginUserOperation for onesignalId: ${op.onesignalId}.")
+                        existingOp.existingOnesignalId = op.existingOnesignalId
+                    } else {
+                        Logging.debug("OperationRepo: internalEnqueue - LoginUserOperation for onesignalId: ${op.onesignalId} already exists in the queue.")
+                    }
+                    if (!addToStore) {
+                        _operationModelStore.remove(queueItem.operation.id)
+                    }
+                    queueItem.waiter?.wake(true)
+                    return
                 }
-                queueItem.waiter?.wake(true)
-                return
             }
 
             if (index != null) {

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/LoginUserOperation.kt

@@ -48,7 +48,7 @@ class LoginUserOperation() : Operation(LoginUserOperationExecutor.LOGIN_USER) {
      */
     var existingOnesignalId: String?
         get() = getOptStringProperty(::existingOnesignalId.name)
-        private set(value) {
+        internal set(value) {
             setOptStringProperty(::existingOnesignalId.name, value)
         }
 

OneSignalSDK/onesignal/core/src/test/java/com/onesignal/core/internal/operations/OperationRepoTests.kt

@@ -100,8 +100,8 @@ class OperationRepoTests : FunSpec({
                 ),
             )
 
-        val cachedOperation = LoginUserOperation()
-        val newOperation = LoginUserOperation()
+        val cachedOperation = LoginUserOperation("appId", "cached-onesignal-id", null, null)
+        val newOperation = LoginUserOperation("appId", "new-onesignal-id", null, null)
         val jsonArray = JSONArray()
 
         // cache the operation