fix: skip dedup merge of local existingOnesignalId

Guard the LoginUserOperation dedup+merge path with !IDManager.isLocalId.
When upgrading from 5.0.0-5.1.7 with a dropped anon-user create, switchUser
returns a local- existingOneSignalId. If RecoverFromDroppedLoginBug wins the
race and its null-existingOnesignalId op is queued first, merging the local
id flips canStartExecute to false and strands the op — the waiter (now
transferred) never wakes, and the stuck op blocks future recovery.

Author: nan-li

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

@@ -1,5 +1,6 @@
 package com.onesignal.core.internal.operations.impl
 
+import com.onesignal.common.IDManager
 import com.onesignal.common.threading.WaiterWithValue
 import com.onesignal.core.internal.config.ConfigModelStore
 import com.onesignal.core.internal.operations.ExecutionResult
@@ -172,9 +173,15 @@ internal class OperationRepo(
                 if (existing != null) {
                     val existingOp = existing.operation as LoginUserOperation
                     // Preserve the anon-user conversion link if the queued op lacks it (e.g. RecoverFromDroppedLoginBug enqueued with null).
-                    if (op.existingOnesignalId != null && existingOp.existingOnesignalId == null) {
-                        Logging.debug("OperationRepo: internalEnqueue - merging existingOnesignalId=${op.existingOnesignalId} into queued LoginUserOperation for onesignalId: ${op.onesignalId}.")
-                        existingOp.existingOnesignalId = op.existingOnesignalId
+                    // Skip local ids: merging one would flip canStartExecute to false and strand the op,
+                    // since a local id that never hit the backend will never receive an idTranslation.
+                    val incomingExistingId = op.existingOnesignalId
+                    if (incomingExistingId != null &&
+                        !IDManager.isLocalId(incomingExistingId) &&
+                        existingOp.existingOnesignalId == null
+                    ) {
+                        Logging.debug("OperationRepo: internalEnqueue - merging existingOnesignalId=$incomingExistingId into queued LoginUserOperation for onesignalId: ${op.onesignalId}.")
+                        existingOp.existingOnesignalId = incomingExistingId
                     } else {
                         Logging.debug("OperationRepo: internalEnqueue - LoginUserOperation for onesignalId: ${op.onesignalId} already exists in the queue.")
                     }

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

@@ -170,6 +170,35 @@ class OperationRepoTests : FunSpec({
         merged.existingOnesignalId shouldBe "anon-uuid"
     }
 
+    test("enqueue dedupe does not merge a local existingOnesignalId onto the queued op") {
+        // Regression: when upgrading from 5.0.0-5.1.7, an anon user's backend-create
+        // may have been dropped, so its onesignalId is still "local-". If
+        // RecoverFromDroppedLoginBug wins the race (queued op has existingOnesignalId=null,
+        // canStartExecute=true), we must NOT overwrite it with the incoming op's local
+        // existingOnesignalId — doing so flips canStartExecute to false and strands the op
+        // forever (the local id will never receive an idTranslation).
+        val mocks = Mocks()
+        val operationRepo = mocks.operationRepo
+
+        val queuedOp = LoginUserOperation("appId", "local-new", "alice", null)
+        queuedOp.id = UUID.randomUUID().toString()
+        synchronized(operationRepo.queue) {
+            operationRepo.queue.add(OperationQueueItem(queuedOp, bucket = 0))
+        }
+
+        val incomingOp = LoginUserOperation("appId", "local-new", "alice", "local-anon")
+
+        // When
+        operationRepo.enqueue(incomingOp)
+        mocks.waitForInternalEnqueue()
+
+        // Then — queue still has one op, existingOnesignalId stays null (canStartExecute stays true)
+        operationRepo.queue.size shouldBe 1
+        val survivor = operationRepo.queue.first().operation as LoginUserOperation
+        survivor.existingOnesignalId shouldBe null
+        survivor.canStartExecute shouldBe true
+    }
+
     test("containsInstanceOf") {
         // Given
         val mocks = Mocks()