Fix flutter 3.24

mapbox · Aug 11, 2024 · 14ddb3d · 14ddb3d
1 parent 019aabe
commit 14ddb3d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -81,5 +81,5 @@ dependencies {
     implementation "com.mapbox.maps:android:11.6.0-rc.1"
 
     implementation "androidx.annotation:annotation:1.7.1"
-    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.3.0"
+    implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.8.4"
 }
diff --git a/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapController.kt b/android/src/main/kotlin/com/mapbox/maps/mapbox_maps/MapboxMapController.kt
@@ -7,7 +7,7 @@ import androidx.lifecycle.DefaultLifecycleObserver
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.ViewTreeLifecycleOwner
+import androidx.lifecycle.setViewTreeLifecycleOwner
 import com.mapbox.bindgen.Value
 import com.mapbox.common.SettingsServiceFactory
 import com.mapbox.common.SettingsServiceStorageType
@@ -67,22 +67,18 @@ class MapboxMapController(
   /*
     Mirrors lifecycle of the parent, with one addition - switches to DESTROYED state
     when `dispose` is called.
-    `parentLifecycle` is the lifecycle of the Flutter activity, which may live much longer then
+    `lifecycle` is the lifecycle of the Flutter activity, which may live much longer then
     the MapView attached.
   */
   private class LifecycleHelper(
-    val parentLifecycle: Lifecycle,
+    override val lifecycle: Lifecycle,
     val shouldDestroyOnDestroy: Boolean,
   ) : LifecycleOwner, DefaultLifecycleObserver {
 
     val lifecycleRegistry: LifecycleRegistry = LifecycleRegistry(this)
 
     init {
-      parentLifecycle.addObserver(this)
-    }
-
-    override fun getLifecycle(): Lifecycle {
-      return lifecycleRegistry
+      lifecycle.addObserver(this)
     }
 
     override fun onCreate(owner: LifecycleOwner) {
@@ -108,7 +104,7 @@ class MapboxMapController(
     override fun onDestroy(owner: LifecycleOwner) = propagateDestroyEvent()
 
     fun dispose() {
-      parentLifecycle.removeObserver(this)
+      lifecycle.removeObserver(this)
       propagateDestroyEvent()
     }
 
@@ -173,14 +169,14 @@ class MapboxMapController(
     }
     lifecycleHelper = LifecycleHelper(lifecycleProvider.getLifecycle()!!, shouldDestroyOnDestroy)
 
-    mapView?.let { ViewTreeLifecycleOwner.set(it, lifecycleHelper) }
+    mapView?.setViewTreeLifecycleOwner(lifecycleHelper)
   }
 
   override fun onFlutterViewDetached() {
     super.onFlutterViewDetached()
     lifecycleHelper?.dispose()
     lifecycleHelper = null
-    ViewTreeLifecycleOwner.set(mapView!!, null)
+    mapView!!.setViewTreeLifecycleOwner(null)
   }
 
   override fun dispose() {
@@ -251,4 +247,4 @@ class MapboxMapController(
     SettingsServiceFactory.getInstance(SettingsServiceStorageType.NON_PERSISTENT)
       .set("com.mapbox.common.telemetry.internal.custom_user_agent_fragment", Value.valueOf("FlutterPlugin/$version"))
   }
-}
+}