Merge pull request #454 from mindbox-cloud/release/2.9.0

Release/2.9.0
mindbox-cloud · Apr 22, 2024 · 1388068 · 1388068
2 parents a375c92 + a616abb
commit 1388068
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -21,4 +21,4 @@ android.enableJetifier=true
 kotlin.code.style=official
 
 # SDK version property
-SDK_VERSION_NAME=2.9.0-rc
+SDK_VERSION_NAME=2.9.0
diff --git a/sdk/src/main/java/cloud/mindbox/mobile_sdk/Mindbox.kt b/sdk/src/main/java/cloud/mindbox/mobile_sdk/Mindbox.kt
@@ -95,6 +95,8 @@ object Mindbox : MindboxLog {
 
     private val mutex = Mutex()
 
+    private val inAppMutex = Mutex()
+
     private var firstInitCall: Boolean = true
 
     /**
@@ -522,7 +524,7 @@ object Mindbox : MindboxLog {
                             if (activity != null && lifecycleManager.isCurrentActivityResumed) {
                                 inAppMessageManager.registerCurrentActivity(activity)
                                 mindboxScope.launch {
-                                    mutex.withLock {
+                                    inAppMutex.withLock {
                                         firstInitCall = false
                                         inAppMessageManager.listenEventAndInApp()
                                         inAppMessageManager.initLogs()
@@ -576,8 +578,8 @@ object Mindbox : MindboxLog {
                             )
                             if (firstInitCall) {
                                 mindboxScope.launch {
-                                    mutex.withLock {
-                                        InitializeLock.await(InitializeLock.State.SAVE_MINDBOX_CONFIG)
+                                    InitializeLock.await(InitializeLock.State.SAVE_MINDBOX_CONFIG)
+                                    inAppMutex.withLock {
                                         if (!firstInitCall) return@launch
                                         firstInitCall = false
                                         inAppMessageManager.listenEventAndInApp()

diff --git a/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/presentation/actions/InAppAction.kt b/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/presentation/actions/InAppAction.kt
@@ -27,11 +27,11 @@ internal class PushPermissionInAppAction(
 
     override fun execute(mindboxView: MindboxView?): InAppActionResult {
         mindboxLogI("In-app for push activation was clicked")
-        mindboxView?.requestPermission()
         return InAppActionResult(
             redirectUrl = "",
             payload = payload,
-            shouldDismiss = shouldDismiss()
+            shouldDismiss = shouldDismiss(),
+            onCompleted = { mindboxView?.requestPermission() }
         )
     }
 

diff --git a/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/presentation/actions/InAppActionResult.kt b/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/presentation/actions/InAppActionResult.kt
@@ -3,5 +3,6 @@ package cloud.mindbox.mobile_sdk.inapp.presentation.actions
 internal data class InAppActionResult(
     val redirectUrl: String,
     val payload: String,
-    val shouldDismiss: Boolean
+    val shouldDismiss: Boolean,
+    val onCompleted: (() -> Unit)? = null
 )
diff --git a/...src/main/java/cloud/mindbox/mobile_sdk/inapp/presentation/view/AbstractInAppViewHolder.kt b/...src/main/java/cloud/mindbox/mobile_sdk/inapp/presentation/view/AbstractInAppViewHolder.kt
@@ -66,6 +66,7 @@ internal abstract class AbstractInAppViewHolder<T : InAppType> :
         var redirectUrl: String
         var payload: String
         var shouldDismiss: Boolean
+
         currentDialog.setSingleClickListener {
 
             val inAppData = inAppActionHandler.handle(
@@ -85,11 +86,15 @@ internal abstract class AbstractInAppViewHolder<T : InAppType> :
                 redirectUrl,
                 payload
             )
+
             if (shouldDismiss) {
                 inAppCallback.onInAppDismissed(wrapper.inAppType.inAppId)
                 mindboxLogI("In-app dismissed by click")
                 hide()
             }
+
+            inAppData.onCompleted?.invoke()
+
             InAppMessageViewDisplayerImpl.isActionExecuted = true
         }
     }

diff --git a/sdk/src/test/java/cloud/mindbox/mobile_sdk/inapp/presentation/InAppActionsTest.kt b/sdk/src/test/java/cloud/mindbox/mobile_sdk/inapp/presentation/InAppActionsTest.kt
@@ -3,7 +3,6 @@ package cloud.mindbox.mobile_sdk.inapp.presentation
 import cloud.mindbox.mobile_sdk.inapp.presentation.actions.PushPermissionInAppAction
 import cloud.mindbox.mobile_sdk.inapp.presentation.actions.RedirectUrlInAppAction
 import io.mockk.mockk
-import io.mockk.verify
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
@@ -51,7 +50,6 @@ class InAppActionsTest {
 
         val data = action.execute(mindboxView)
 
-        verify { mindboxView.requestPermission() }
         Assert.assertEquals("", data.redirectUrl)
         Assert.assertEquals(payload, data.payload)
         Assert.assertEquals(true, data.shouldDismiss)