Merge pull request #1900 from OneSignal/v5_retry_failed_create_user

[v5] Pause operation repo and retry failed user create

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

@@ -71,4 +71,11 @@ enum class ExecutionResult {
  * The operation failed due to a conflict and can be handled.
  */
  FAIL_CONFLICT,
+
+ /**
+ * Used in special create user case.
+ * The operation failed due to a non-retryable error. Pause the operation repo
+ * and retry on a new session, giving the SDK a chance to recover from the failed user create.
+ */
+ FAIL_PAUSE_OPREPO,
 }

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

@@ -30,6 +30,7 @@ internal class OperationRepo(
  private val executorsMap: Map<String, IOperationExecutor>
  private val queue = mutableListOf<OperationQueueItem>()
  private val waiter = WaiterWithValue<Boolean>()
+ private var paused = false
 
  init {
  val executorsMap: MutableMap<String, IOperationExecutor> = mutableMapOf()
@@ -47,6 +48,7 @@ internal class OperationRepo(
  }
 
  override fun start() {
+ paused = false
  suspendifyOnThread(name = "OpRepo") {
  processQueueForever()
  }
@@ -99,6 +101,10 @@ internal class OperationRepo(
 
  // This runs forever, until the application is destroyed.
  while (true) {
+ if (paused) {
+ Logging.debug("OperationRepo is paused")
+ return
+ }
  try {
  var ops: List<OperationQueueItem>? = null
 
@@ -199,6 +205,15 @@ internal class OperationRepo(
  ops.reversed().forEach { queue.add(0, it) }
  }
  }
+ ExecutionResult.FAIL_PAUSE_OPREPO -> {
+ Logging.error("Operation execution failed with eventual retry, pausing the operation repo: $operations")
+ // keep the failed operation and pause the operation repo from executing
+ paused = true
+ // add back all operations to the front of the queue to be re-executed.
+ synchronized(queue) {
+ ops.reversed().forEach { queue.add(0, it) }
+ }
+ }
  }
 
  // if there are operations provided on the result, we need to enqueue them at the

OneSignalSDK/onesignal/core/src/main/java/com/onesignal/user/internal/operations/impl/executors/LoginUserOperationExecutor.kt

@@ -205,7 +205,7 @@ internal class LoginUserOperationExecutor(
  NetworkUtils.ResponseStatusType.UNAUTHORIZED ->
  ExecutionResponse(ExecutionResult.FAIL_UNAUTHORIZED)
  else ->
- ExecutionResponse(ExecutionResult.FAIL_NORETRY)
+ ExecutionResponse(ExecutionResult.FAIL_PAUSE_OPREPO)
  }
  }
  }