move OperationModelStore.load() out of init block and call load after OperationRepo starts

Author: jinliu9508

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

@@ -25,10 +25,15 @@ import com.onesignal.user.internal.operations.impl.executors.LoginUserOperationE
 import com.onesignal.user.internal.operations.impl.executors.RefreshUserOperationExecutor
 import com.onesignal.user.internal.operations.impl.executors.SubscriptionOperationExecutor
 import com.onesignal.user.internal.operations.impl.executors.UpdateUserOperationExecutor
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.launch
 import org.json.JSONObject
 
 internal class OperationModelStore(prefs: IPreferencesService) : ModelStore<Operation>("operations", prefs) {
-    init {
+
+    fun loadOperations() {
         load()
     }
 

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

@@ -81,13 +81,6 @@ internal class OperationRepo(
             }
         }
         this.executorsMap = executorsMap
-
-        // load operation in a separate thread to avoid halting the main process
-        coroutineScope.launch {
-            for (operation in _operationModelStore.list().withIndex()) {
-                internalEnqueue(OperationQueueItem(operation.value, bucket = enqueueIntoBucket), flush = false, addToStore = false, operation.index)
-            }
-        }
     }
 
     override fun <T : Operation> containsInstanceOf(type: KClass<T>): Boolean {
@@ -98,7 +91,11 @@ internal class OperationRepo(
 
     override fun start() {
         paused = false
-        coroutineScope.launch { processQueueForever() }
+        coroutineScope.launch {
+            // load saved operations first then start processing the queue to ensure correct operation order
+            loadSavedOperations()
+            processQueueForever()
+        }
     }
 
     override fun enqueue(
@@ -128,10 +125,10 @@ internal class OperationRepo(
         queueItem: OperationQueueItem,
         flush: Boolean,
         addToStore: Boolean,
-        index: Int = -1,
+        index: Int? = null,
     ) {
         synchronized(queue) {
-            if (index >= 0)
+            if (index != null)
                 queue.add(index, queueItem)
             else
                 queue.add(queueItem)
@@ -363,4 +360,16 @@ internal class OperationRepo(
 
         return ops
     }
+
+    /**
+     * Load saved operations from preference service and add them into the queue
+     * NOTE: sometimes the loading might take longer than expectedly due to device's state
+     */
+    private fun loadSavedOperations() {
+        // load operation in a separate thread to avoid halting the main process
+        _operationModelStore.loadOperations()
+        for (operation in _operationModelStore.list().withIndex()) {
+            internalEnqueue(OperationQueueItem(operation.value, bucket = enqueueIntoBucket), flush = false, addToStore = false, operation.index)
+        }
+    }
 }

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

@@ -35,6 +35,7 @@ private class Mocks {
     val operationModelStore: OperationModelStore =
         run {
             val mockOperationModelStore = mockk<OperationModelStore>()
+            every {mockOperationModelStore.loadOperations() } just runs
             every { mockOperationModelStore.list() } returns listOf()
             every { mockOperationModelStore.add(any()) } just runs
             every { mockOperationModelStore.remove(any()) } just runs