fix(android): stabilize lifecycle handling for MapView detachment

pinpong · pinpong · commit 3f253280af62 · 2025-11-28T22:32:32.000+07:00
diff --git a/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt b/android/src/main/java/com/rngooglemapsplus/GoogleMapsViewImpl.kt
@@ -867,10 +867,9 @@ class GoogleMapsViewImpl(
   }
 
   override fun onDetachedFromWindow() {
-    super.onDetachedFromWindow()
     lifecycleObserver?.let { lifecycle?.removeObserver(it) }
     lifecycle = null
-    lifecycleObserver?.toCreatedState()
+    super.onDetachedFromWindow()
   }
 
   override fun onMarkerClick(marker: Marker): Boolean {
diff --git a/android/src/main/java/com/rngooglemapsplus/MapLifecycleEventObserver.kt b/android/src/main/java/com/rngooglemapsplus/MapLifecycleEventObserver.kt
@@ -35,6 +35,7 @@ class MapLifecycleEventObserver(
   }
 
   private fun toState(state: Lifecycle.State) {
+    if (currentState == Lifecycle.State.DESTROYED) return
     while (currentState != state) {
       when {
         currentState < state -> upFromCurrentState()

Original file line number	Diff line number	Diff line change
`@@ -867,10 +867,9 @@ class GoogleMapsViewImpl(`
`867`	`867`	`}`
`868`	`868`
`869`	`869`	`override fun onDetachedFromWindow() {`
`870`		`- super.onDetachedFromWindow()`
`871`	`870`	`lifecycleObserver?.let { lifecycle?.removeObserver(it) }`
`872`	`871`	`lifecycle = null`
`873`		`- lifecycleObserver?.toCreatedState()`
	`872`	`+ super.onDetachedFromWindow()`
`874`	`873`	`}`
`875`	`874`
`876`	`875`	`override fun onMarkerClick(marker: Marker): Boolean {`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ class MapLifecycleEventObserver(`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`private fun toState(state: Lifecycle.State) {`
	`38`	`+ if (currentState == Lifecycle.State.DESTROYED) return`
`38`	`39`	`while (currentState != state) {`
`39`	`40`	`when {`
`40`	`41`	`currentState < state -> upFromCurrentState()`