Skip to content

DIA-6317 fix showView/removeView crashes on reused message view #889

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

Open
mguerra10128 wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

DIA-6317 fix showView/removeView crashes on reused message view #889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 12 additions & 5 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 @@ -317,18 +317,25 @@ class SpConsentLibMobileCore(
}

private fun disposeMessageUI() {
// Remove view from parent before nullifying to avoid NPE in ViewGroup
messageUI?.let { removeView(it as View) }
// Remove view from parent before nullifying to avoid NPE in ViewGroup.
// This can be called from a background coroutine, so the view removal must happen on main.
val ui = messageUI as? View
messageUI = null
ui?.let { runOnMain { removeView(it) } }
}

override fun showView(view: View) {
mainView?.let { parentView ->
// the same message view may be "shown" more than once (e.g. onUIReady called again for a
// re-used web view), so make sure we never add a view that already has a parent
(view.parent as? ViewGroup)?.takeIf { it != parentView }?.removeView(view)
view.layoutParams = ViewGroup.LayoutParams(MATCH_PARENT, MATCH_PARENT)
if (hideAppsViewsFromAccessibilityWhileMessageIsDisplayed) {
hideMainViewChildrenFromAccessibility(parentView)
if (view.parent == null) {
if (hideAppsViewsFromAccessibilityWhileMessageIsDisplayed) {
hideMainViewChildrenFromAccessibility(parentView)
}
parentView.addView(view)
}
parentView.addView(view)
view.bringToFront()
view.requestLayout()
view.requestFocus()
Expand Down
Loading