Skip to content

MOBILE-175: Fix ReactContext listener cleanup on Android #173

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
sergeysozinov merged 1 commit into from
May 13, 2026
Merged

MOBILE-175: Fix ReactContext listener cleanup on Android #173

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
29 changes: 20 additions & 9 deletions android/src/main/java/com/mindboxsdk/MindboxSdkLifecycleListener.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,29 +55,39 @@ internal class MindboxSdkLifecycleListener private constructor(

private var activityEventListener: ActivityEventListener? = null
private var reactInstanceEventListener: ReactInstanceEventListener? = null
private var reactInstanceEventListenerActivity: Activity? = null
Comment thread
enotniy marked this conversation as resolved.

private fun onReactContextAvailable(reactContext: ReactContext, activity: Activity) {
Mindbox.writeLog("[RN] ReactContext ready", Level.INFO)
addActivityEventListener(reactContext)
subscriber.onEvent(MindboxSdkLifecycleEvent.ActivityCreated(reactContext, activity))
}

private fun registerReactContextListener(onReady: (ReactContext) -> Unit) {
private fun registerReactContextListener(activity: Activity, onReady: (ReactContext) -> Unit) {
val host = getReactHost(application) ?: run {
Mindbox.writeLog(
"[RN] registerReactContextListener: ReactHost is null, skip listener.",
Level.WARN
)
return
}
reactInstanceEventListener?.let { host.removeReactInstanceEventListener(it) }
reactInstanceEventListener?.let { previousListener ->
host.removeReactInstanceEventListener(previousListener)
}
reactInstanceEventListenerActivity = null
val listener = object : ReactInstanceEventListener {
override fun onReactContextInitialized(context: ReactContext) {
Mindbox.writeLog("[RN] ReactContext initialized (listener)", Level.INFO)
host.removeReactInstanceEventListener(this)
if (reactInstanceEventListener === this) {
reactInstanceEventListener = null
reactInstanceEventListenerActivity = null
}
onReady(context)
}
}
reactInstanceEventListener = listener
reactInstanceEventListenerActivity = activity
host.addReactInstanceEventListener(listener)
}

Expand All @@ -86,7 +96,7 @@ internal class MindboxSdkLifecycleListener private constructor(

val hasConsumedReactContext = AtomicBoolean(false)

registerReactContextListener { reactContext ->
registerReactContextListener(activity) { reactContext ->
if (hasConsumedReactContext.compareAndSet(false, true)) {
onReactContextAvailable(reactContext, activity)
}
Expand Down Expand Up @@ -127,13 +137,14 @@ internal class MindboxSdkLifecycleListener private constructor(

override fun onActivityDestroyed(activity: Activity) {
if (!isMainActivity(activity)) return
subscriber.onEvent(MindboxSdkLifecycleEvent.ActivityDestroyed(activity))
getReactContext()?.removeActivityEventListener(activityEventListener)
activityEventListener = null
reactInstanceEventListener?.let { listener ->
getReactHost(application)?.removeReactInstanceEventListener(listener)
if (reactInstanceEventListenerActivity === activity) {
Comment thread
enotniy marked this conversation as resolved.
reactInstanceEventListener?.let { listener ->
getReactHost(application)?.removeReactInstanceEventListener(listener)
}
reactInstanceEventListener = null
reactInstanceEventListenerActivity = null
}
reactInstanceEventListener = null
subscriber.onEvent(MindboxSdkLifecycleEvent.ActivityDestroyed(activity))
}
Comment thread
sergeysozinov marked this conversation as resolved.
Comment thread
sergeysozinov marked this conversation as resolved.

override fun onActivityStarted(activity: Activity) {}
Expand Down
Loading