Skip to content

DIA-6123 prevent messageUI from being created on finished() #885

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 2 commits into from
Mar 25, 2026
Merged

DIA-6123 prevent messageUI from being created on finished() #885

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
404fc3e
prevent messageUI from being created on finished()
andresilveirah Mar 13, 2026
f8ba84e
remove messageUI before setting it to null
andresilveirah Mar 23, 2026
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: 12 additions & 6 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 @@ -86,7 +86,7 @@ class SpConsentLibMobileCore(
}

// used to store accessibility state of main view's children
private var a11ySnapshot: WeakHashMap<View, Int> = WeakHashMap()
private var a11ySnapshot: WeakHashMap<View?, Int> = WeakHashMap()

private var messageUI: SPMessageUI? = null
fun getOrCreateMessageUI(): SPMessageUI {
Expand Down Expand Up @@ -139,7 +139,7 @@ class SpConsentLibMobileCore(

private fun renderNextMessageIfAny() =
if (pendingActions == 0 && messagesToDisplay.isEmpty()) {
messageUI = null
disposeMessageUI()
spClient.onSpFinished(spConsents)
} else if (messagesToDisplay.isNotEmpty()) {
val messageToRender = messagesToDisplay.removeFirst()
Expand Down Expand Up @@ -311,11 +311,17 @@ class SpConsentLibMobileCore(

private fun restoreChildrenA11y() {
for ((view, accessibilityState) in a11ySnapshot.entries.toList()) {
view.importantForAccessibility = accessibilityState
view?.importantForAccessibility = accessibilityState
}
a11ySnapshot.clear()
}

private fun disposeMessageUI() {
// Remove view from parent before nullifying to avoid NPE in ViewGroup
messageUI?.let { removeView(it as View) }
messageUI = null
}

override fun showView(view: View) {
mainView?.let { parentView ->
view.layoutParams = ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)
Expand Down Expand Up @@ -382,7 +388,7 @@ class SpConsentLibMobileCore(
spClient.onConsentReady(SPConsents(userData))
pendingActions--
if (pendingActions == 0) {
messageUI = null
disposeMessageUI()
spClient.onSpFinished(spConsents)
}
}.onFailure {
Expand All @@ -396,7 +402,7 @@ class SpConsentLibMobileCore(
finished(view)
}
ActionType.PM_DISMISS -> {
if (getOrCreateMessageUI().isFirstLayer) {
if (messageUI?.isFirstLayer == true) {
pendingActions--
finished(view)
}
Expand Down Expand Up @@ -435,7 +441,7 @@ class SpConsentLibMobileCore(
}

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