Skip to content

[DIA-6071] reinit messageUI object on new pending actions #879

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
andresilveirah merged 4 commits into from
Oct 7, 2025
Merged

[DIA-6071] reinit messageUI object on new pending actions #879

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2a396c
reinit `messageUI` on new pending actions
Nevazhnovu Oct 6, 2025
da17357
lateinit `messageUI`
Nevazhnovu Oct 6, 2025
ff2f1ba
review fix
Nevazhnovu Oct 6, 2025
a458504
review fix
Nevazhnovu Oct 7, 2025
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
18 changes: 11 additions & 7 deletions cmplibrary/src/main/java/com/sourcepoint/cmplibrary/SpConsentLibMobileCore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,15 @@ class SpConsentLibMobileCore(
private val userData: SPUserData get() = coordinator.userData
private val spConsents: SPConsents get() = SPConsents(userData)

private val messageUI: SPMessageUI by lazy {
SPConsentWebView.create(
private var messageUI: SPMessageUI? = null
fun getOrCreateMessageUI(): SPMessageUI {
messageUI = messageUI ?: SPConsentWebView.create(
context = context,
messageUIClient = this@SpConsentLibMobileCore,
propertyId = propertyId,
onBackPressed = dismissMessageOnBackPress
)
return messageUI!!
}

override fun loadMessage() = loadMessage(authId = null, pubData = null, cmpViewId = null)
Expand Down Expand Up @@ -125,10 +127,11 @@ class SpConsentLibMobileCore(

private fun renderNextMessageIfAny() =
if (pendingActions == 0 && messagesToDisplay.isEmpty()) {
messageUI = null
spClient.onSpFinished(spConsents)
} else if (messagesToDisplay.isNotEmpty()) {
val messageToRender = messagesToDisplay.removeFirst()
messageUI.load(
getOrCreateMessageUI().load(
message = messageToRender.message,
messageType = MessageType.fromMessageSubCategory(messageToRender.metaData.subCategoryId),
url = messageToRender.url,
Expand Down Expand Up @@ -263,7 +266,7 @@ class SpConsentLibMobileCore(
}

pendingActions++
messageUI.load(
getOrCreateMessageUI().load(
messageType = messageType,
url = buildPMUrl(
campaignType = campaignType,
Expand Down Expand Up @@ -293,7 +296,7 @@ class SpConsentLibMobileCore(
}

override fun dismissMessage() {
messageUI.dismiss()
getOrCreateMessageUI().dismiss()
}

@Deprecated(message = "This method is deprecated and has no effect.")
Expand Down Expand Up @@ -335,6 +338,7 @@ class SpConsentLibMobileCore(
spClient.onConsentReady(SPConsents(userData))
pendingActions--
if (pendingActions == 0) {
messageUI = null
spClient.onSpFinished(spConsents)
}
}.onFailure {
Expand All @@ -348,7 +352,7 @@ class SpConsentLibMobileCore(
finished(view)
}
ActionType.PM_DISMISS -> {
if (messageUI.isFirstLayer) {
if (getOrCreateMessageUI().isFirstLayer) {
pendingActions--
finished(view)
}
Expand Down Expand Up @@ -386,7 +390,7 @@ class SpConsentLibMobileCore(
}

override fun finished(view: View) {
messageUI.isPresenting = false
getOrCreateMessageUI().isPresenting = false
runOnMain { spClient.onUIFinished(view) }
renderNextMessageIfAny()
}
Expand Down