Skip to content

Release/2.9.0 #454

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 22, 2024
Merged

Release/2.9.0 #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
71d18f4
MBX-3181: changed order handle click and request permission (#453)
sergeysozinov Apr 19, 2024
b16b8d0
MBX-3295: fixed dead lock (#450)
sergeysozinov Apr 11, 2024
a616abb
Bump SDK version to 2.9.0
Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 5 additions & 3 deletions sdk/src/main/java/cloud/mindbox/mobile_sdk/Mindbox.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ object Mindbox : MindboxLog {

private val mutex = Mutex()

private val inAppMutex = Mutex()

private var firstInitCall: Boolean = true

/**
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
4 changes: 2 additions & 2 deletions sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/presentation/actions/InAppAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() }
)
}

Expand Down
3 changes: 2 additions & 1 deletion sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/presentation/actions/InAppActionResult.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
5 changes: 5 additions & 0 deletions ...src/main/java/cloud/mindbox/mobile_sdk/inapp/presentation/view/AbstractInAppViewHolder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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
}
}
Expand Down
2 changes: 0 additions & 2 deletions sdk/src/test/java/cloud/mindbox/mobile_sdk/inapp/presentation/InAppActionsTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down