[Backport release/v0.17] Map view enabled settings fix (#8006)

Backport d155fc4b27df3b372c11ab97542f5a7491baacd4 from #7683.

cc @mapbox/maps-android
cc @mapbox/sdk-ci

Co-authored-by: Sergei Kasianov <[email protected]>
GitOrigin-RevId: 86cb80dc73710eacde4373ce0981b1d621261066

Author: 2 people

CHANGELOG.md

@@ -6,12 +6,16 @@ Mapbox welcomes participation and contributions from everyone.
 
 # main
 
+# 11.17.0-rc.1
+## Features ✨ and improvements 🏁
 * Promote `ModelLayer` to stable.
 * Add `SymbolLayer.occlusionOpacityMode`, `SymbolLayer.iconColorBrightnessMax`, `SymbolLayer.iconColorBrightnessMin`, `SymbolLayer.iconColorContrast` properties.
 * Add `FillExtrusionLayer.castShadows` property.
 * Add `GeoJsonSource.minZoom` property.
 * Add `RasterArraySource.volatile` experimental property.
 
+## Bug fixes 🐞
+* Fix camera listener not unsubscribed when disabling ScaleBar via `updateSettings { enabled = false }`
 
 # 11.17.0-beta.1 November 05, 2025
 ## Breaking changes ⚠️
@@ -58,7 +62,6 @@ Mapbox welcomes participation and contributions from everyone.
 ## Dependencies
 * Update gl-native to [v11.16.1](https://github.com/mapbox/mapbox-maps-android/releases/tag/v11.16.1), common to [v24.16.1](https://github.com/mapbox/mapbox-maps-android/releases/tag/v11.16.1).
 
-
 # 11.16.0 October 21, 2025
 ## Bug fixes 🐞
 * Fix location request leak when setting custom location provider after updating settings

plugin-scalebar/src/test/java/com/mapbox/maps/plugin/scalebar/ScaleBarPluginTest.kt

@@ -5,6 +5,7 @@ import android.content.res.TypedArray
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.widget.FrameLayout
+import com.mapbox.common.Cancelable
 import com.mapbox.maps.MapOptions
 import com.mapbox.maps.Projection
 import com.mapbox.maps.plugin.delegates.MapCameraManagerDelegate
@@ -40,6 +41,7 @@ class ScaleBarPluginTest {
   private val context: Context = mockk(relaxed = true)
   private val typedArray: TypedArray = mockk(relaxUnitFun = true)
   private val drawable = mockk<Drawable>(relaxed = true)
+  private val cancelable = mockk<Cancelable>(relaxUnitFun = true)
 
   @Before
   fun setUp() {
@@ -63,6 +65,7 @@ class ScaleBarPluginTest {
     every { typedArray.getDrawable(any()) } returns drawable
     every { typedArray.hasValue(any()) } returns true
     every { scaleBarView.pixelRatio } returns 1.5f
+    every { mapListenerManagerDelegate.subscribeCameraChangedCoalesced(any()) } returns cancelable
 
     scaleBarPlugin = ScaleBarPluginImpl { scaleBarView }
     scaleBarPlugin.onDelegateProvider(delegateProvider)
@@ -85,12 +88,14 @@ class ScaleBarPluginTest {
   fun setEnabled_true() {
     scaleBarPlugin.enabled = true
     assertEquals(true, scaleBarPlugin.getSettings().enabled)
+    verify(atLeast = 1) { mapListenerManagerDelegate.subscribeCameraChangedCoalesced(any()) }
   }
 
   @Test
   fun setEnabled_false() {
     scaleBarPlugin.enabled = false
     assertEquals(false, scaleBarPlugin.getSettings().enabled)
+    verify { cancelable.cancel() }
   }
 
   @Test
@@ -113,4 +118,31 @@ class ScaleBarPluginTest {
     verify { scaleBarPlugin.useContinuousRendering = true }
     verify { scaleBarView.useContinuousRendering = true }
   }
+
+  @Test
+  fun updateSettings_disable() {
+    assertEquals(true, scaleBarPlugin.getSettings().enabled)
+    scaleBarPlugin.updateSettings { enabled = false }
+    verify { cancelable.cancel() }
+    verify { scaleBarView.enable = false }
+    assertEquals(false, scaleBarPlugin.getSettings().enabled)
+  }
+
+  @Test
+  fun updateSettings_enable() {
+    scaleBarPlugin.enabled = false
+    scaleBarPlugin.updateSettings { enabled = true }
+    verify(atLeast = 2) { mapListenerManagerDelegate.subscribeCameraChangedCoalesced(any()) }
+    verify { scaleBarView.enable = true }
+    assertEquals(true, scaleBarPlugin.getSettings().enabled)
+  }
+
+  @Test
+  fun updateSettings_enableUnchanged() {
+    assertEquals(true, scaleBarPlugin.getSettings().enabled)
+    scaleBarPlugin.updateSettings { marginLeft = 20f }
+    // listener remains active (only subscribed once during initialize)
+    verify(exactly = 1) { mapListenerManagerDelegate.subscribeCameraChangedCoalesced(any()) }
+    assertEquals(true, scaleBarPlugin.getSettings().enabled)
+  }
 }