Skip to content

fix(android): port VMI dispose and Handler fixes to the legacy backend #333

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
mfazekas merged 2 commits into from
Jul 14, 2026
Merged

fix(android): port VMI dispose and Handler fixes to the legacy backend #333

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa581db
fix(android): don't serve or re-cache the VMI snapshot after dispose …
mfazekas Jul 13, 2026
56e0c8a
perf(android): reuse a cached main-thread Handler for snapshot refres…
mfazekas Jul 13, 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
11 changes: 10 additions & 1 deletion android/src/legacy/java/com/rive/RiveReactNativeView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,9 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
if (willDispose) {
riveAnimationView?.dispose()
removeEventListeners()
// Post-dispose reads must resolve null, not the retained (released)
// instance; also stops pinning it for the view's remaining lifetime.
lastKnownViewModelInstance = null
}
super.onDetachedFromWindow()
}
Expand Down Expand Up @@ -181,7 +184,13 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
@Volatile
private var lastKnownViewModelInstance: ViewModelInstance? = null

private val mainHandler = android.os.Handler(android.os.Looper.getMainLooper())

private fun readViewModelInstanceOnMain(): ViewModelInstance? {
// A refresh posted before dispose() can run after it; reading the
// torn-down controller's stale list here would re-cache a released
// instance right after onDetachedFromWindow cleared it.
if (willDispose) return null
val stateMachines = riveAnimationView?.controller?.stateMachines
return if (!stateMachines.isNullOrEmpty()) {
stateMachines.first().viewModelInstance
Expand All @@ -195,7 +204,7 @@ class RiveReactNativeView(context: ThemedReactContext) : FrameLayout(context) {
lastKnownViewModelInstance = readViewModelInstanceOnMain()
return lastKnownViewModelInstance
}
android.os.Handler(android.os.Looper.getMainLooper()).post {
mainHandler.post {
lastKnownViewModelInstance = readViewModelInstanceOnMain()
}
return lastKnownViewModelInstance
Expand Down
Loading