WMRUSTORE-36: Fix race condition for initPushServices

jitpack.yml

@@ -1,2 +1,2 @@
 jdk:
-  - openjdk11
+  - openjdk17

sdk/src/main/java/cloud/mindbox/mobile_sdk/Mindbox.kt

@@ -94,9 +94,9 @@ object Mindbox : MindboxLog {
     private val getDeviceIdMutex = Mutex()
     private val inAppMutex = Mutex()
     private val mutexUpdateAppInfo: Mutex = Mutex()
+    private val pushServiceMutex = Mutex()
 
     private var firstInitCall: Boolean = true
-    private var isPushServiceInitialized = false
 
     private val migrationManager: MigrationManager by mindboxInject { migrationManager }
 
@@ -569,10 +569,10 @@ object Mindbox : MindboxLog {
 
             initScope.launch {
                 InitializeLock.await(InitializeLock.State.MIGRATION)
+                DbManager.saveConfigurations(Configuration(configuration))
                 setPushServiceHandler(context, pushServices)
                 val checkResult = checkConfig(configuration)
                 val validatedConfiguration = validateConfiguration(configuration)
-                DbManager.saveConfigurations(Configuration(configuration))
                 logI("init. checkResult: $checkResult")
                 if (checkResult != ConfigUpdate.NOT_UPDATED && !MindboxPreferences.isFirstInitialize) {
                     logI("init. softReinitialization")
@@ -759,17 +759,34 @@ object Mindbox : MindboxLog {
 
     private suspend fun setPushServiceHandler(
         context: Context,
-        pushServices: List<MindboxPushService>? = null,
+        pushServices: List<MindboxPushService>,
     ): Unit = loggingRunCatchingSuspending {
-        if (pushServiceHandlers.isEmpty() && pushServices != null && !isPushServiceInitialized) {
-            isPushServiceInitialized = true
+        if (pushServices.isEmpty()) {
+            mindboxLogW("initPushServices: Push services list is empty")
+            return@loggingRunCatchingSuspending
+        }
+
+        if (pushServiceHandlers.isNotEmpty()) {
+            mindboxLogI("initPushServices: Push services already initialized")
+            return@loggingRunCatchingSuspending
+        }
+
+        pushServiceMutex.withLock {
+            if (pushServiceHandlers.isNotEmpty()) {
+                mindboxLogI("initPushServices: Push services already initialized")
+                return@withLock
+            }
+
             mindboxLogI("initPushServices: " + pushServices.joinToString { it.tag })
+            Stopwatch.start(Stopwatch.INIT_PUSH_SERVICES)
 
             pushServiceHandlers = selectPushServiceHandler(context, pushServices)
 
             pushServiceHandlers.map { handler ->
                 mindboxScope.async { handler.initService(context) }
             }.awaitAll()
+
+            mindboxLogI("initPushServices completed in " + Stopwatch.stop(Stopwatch.INIT_PUSH_SERVICES))
             mindboxScope.launch {
                 if (!MindboxPreferences.isFirstInitialize) {
                     updateAppInfo(context)

sdk/src/main/java/cloud/mindbox/mobile_sdk/utils/Stopwatch.kt

@@ -8,6 +8,7 @@ internal object Stopwatch : MindboxLog {
 
     internal const val INIT_SDK = "INIT_SDK"
     internal const val GET_PUSH_TOKENS = "GET_PUSH_TOKENS"
+    internal const val INIT_PUSH_SERVICES = "INIT_PUSH_SERVICES"
 
     private val entries: MutableMap<String, Long> by lazy { mutableMapOf() }