NAVAND-4611: support navigator recreation

dzinad · github-actions[bot] · commit 5c082dbe1a8f · 2025-08-25T08:06:36.000Z
GitOrigin-RevId: c46e4d179a6a6d7199a3cba490efcaa33af2eccc
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -8,7 +8,7 @@ ext {
       carMinSdkVersion        : 23
   ]
 
-  def mapboxSdkVersionSuffix = '15.0-beta.2'
+  def mapboxSdkVersionSuffix = '16.0-SNAPSHOT-08-21--04-30.git-5047151'
 
   def ndkVersionSuffix = ""
   if (project.hasProperty("ndkMajor")) {
@@ -34,7 +34,7 @@ ext {
       mapboxNavigator           : "${mapboxNavigatorVersion}",
       mapboxCommonNative        : "24.${mapboxSdkVersionSuffix}",
       mapboxNavSdkCpp           : "0.${mapboxSdkVersionSuffix}",
-      mapboxSearch              : '2.15.0-beta.2',
+      mapboxSearch              : '2.16.0-5047151-SNAPSHOT',
       mapboxBaseAndroid         : '0.11.0',
       androidXActivity          : '1.7.1',
       androidXActivityCompose   : '1.9.2',
diff --git a/navigation/src/main/java/com/mapbox/navigation/core/internal/PredictiveCache.kt b/navigation/src/main/java/com/mapbox/navigation/core/internal/PredictiveCache.kt
@@ -22,7 +22,7 @@ class PredictiveCache(private val mapboxNavigation: MapboxNavigation) {
 
     init {
         // recreate controllers with the same options but with a new navigator instance
-        mapboxNavigation.navigator.setNativeNavigatorRecreationObserver {
+        mapboxNavigation.navigator.addNativeNavigatorRecreationObserver {
             val navOptions = navPredictiveCacheOptions.toSet()
             val mapControllersData = cachedMapsPredictiveCacheControllers
                 .map { (mapboxMap, predictiveCacheControllersMap) ->
diff --git a/navigation/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt b/navigation/src/main/java/com/mapbox/navigation/core/trip/session/MapboxTripSession.kt
@@ -299,7 +299,7 @@ internal class MapboxTripSession(
     }
 
     init {
-        navigator.setNativeNavigatorRecreationObserver {
+        navigator.addNativeNavigatorRecreationObserver {
             if (fallbackVersionsObservers.isNotEmpty()) {
                 navigator.setFallbackVersionsObserver(nativeFallbackVersionsObserver)
             }
diff --git a/navigation/src/main/java/com/mapbox/navigation/core/trip/session/eh/EHorizonSubscriptionManagerImpl.kt b/navigation/src/main/java/com/mapbox/navigation/core/trip/session/eh/EHorizonSubscriptionManagerImpl.kt
@@ -87,7 +87,7 @@ internal class EHorizonSubscriptionManagerImpl(
         }
 
     init {
-        navigator.setNativeNavigatorRecreationObserver {
+        navigator.addNativeNavigatorRecreationObserver {
             if (eHorizonObservers.isNotEmpty()) {
                 setNavigatorObservers()
             }
diff --git a/navigation/src/main/java/com/mapbox/navigation/core/trip/session/eh/RoadObjectMatcher.kt b/navigation/src/main/java/com/mapbox/navigation/core/trip/session/eh/RoadObjectMatcher.kt
@@ -32,7 +32,7 @@ class RoadObjectMatcher internal constructor(
     private val roadObjectMatcherObservers = CopyOnWriteArraySet<RoadObjectMatcherObserver>()
 
     init {
-        navigator.setNativeNavigatorRecreationObserver {
+        navigator.addNativeNavigatorRecreationObserver {
             if (roadObjectMatcherObservers.isNotEmpty()) {
                 navigator.roadObjectMatcher.setListener(roadObjectMatcherListener)
             }
diff --git a/navigation/src/main/java/com/mapbox/navigation/core/utils/SystemLocaleWatcher.kt b/navigation/src/main/java/com/mapbox/navigation/core/utils/SystemLocaleWatcher.kt
@@ -34,7 +34,7 @@ internal class SystemLocaleWatcher private constructor(
             ContextCompat.RECEIVER_NOT_EXPORTED,
         )
 
-        navigator.setNativeNavigatorRecreationObserver {
+        navigator.addNativeNavigatorRecreationObserver {
             navigator.setUserLanguages(context.deviceLanguageTags)
         }
         navigator.setUserLanguages(context.deviceLanguageTags)
diff --git a/navigation/src/test/java/com/mapbox/navigation/core/internal/cache/PredictiveCacheTests.kt b/navigation/src/test/java/com/mapbox/navigation/core/internal/cache/PredictiveCacheTests.kt
@@ -28,7 +28,7 @@ class PredictiveCacheTests {
     @Before
     fun setUp() {
         every {
-            navigator.setNativeNavigatorRecreationObserver(
+            navigator.addNativeNavigatorRecreationObserver(
                 capture(navigatorRecreationCallbackSlot),
             )
         } just Runs
diff --git a/navigation/src/test/java/com/mapbox/navigation/core/trip/session/MapboxTripSessionTest.kt b/navigation/src/test/java/com/mapbox/navigation/core/trip/session/MapboxTripSessionTest.kt
@@ -200,7 +200,7 @@ class MapboxTripSessionTest {
             navigator.addNavigatorObserver(capture(navigatorObserverImplSlot))
         } answers {}
         every {
-            navigator.setNativeNavigatorRecreationObserver(
+            navigator.addNativeNavigatorRecreationObserver(
                 capture(navigatorRecreationObserverImplSlot),
             )
         } answers {}
diff --git a/navigation/src/test/java/com/mapbox/navigation/core/utils/SystemLocaleWatcherTest.kt b/navigation/src/test/java/com/mapbox/navigation/core/utils/SystemLocaleWatcherTest.kt
@@ -125,7 +125,7 @@ class SystemLocaleWatcherTest {
     fun setsUserLanguageProviderOnNavigationRecreationEvent() {
         val navRecreationObserverSlot = slot<NativeNavigatorRecreationObserver>()
         every {
-            navigator.setNativeNavigatorRecreationObserver(capture(navRecreationObserverSlot))
+            navigator.addNativeNavigatorRecreationObserver(capture(navRecreationObserverSlot))
         } just Runs
 
         createWatcher()
diff --git a/navigator/src/main/java/com/mapbox/navigation/navigator/internal/MapboxNativeNavigator.kt b/navigator/src/main/java/com/mapbox/navigation/navigator/internal/MapboxNativeNavigator.kt
@@ -134,7 +134,11 @@ interface MapboxNativeNavigator : RerouteEventsProvider {
 
     fun setFallbackVersionsObserver(fallbackVersionsObserver: FallbackVersionsObserver?)
 
-    fun setNativeNavigatorRecreationObserver(
+    fun addNativeNavigatorRecreationObserver(
+        nativeNavigatorRecreationObserver: NativeNavigatorRecreationObserver,
+    )
+
+    fun removeNativeNavigatorRecreationObserver(
         nativeNavigatorRecreationObserver: NativeNavigatorRecreationObserver,
     )
 
diff --git a/navigator/src/main/java/com/mapbox/navigation/navigator/internal/MapboxNativeNavigatorImpl.kt b/navigator/src/main/java/com/mapbox/navigation/navigator/internal/MapboxNativeNavigatorImpl.kt
@@ -402,12 +402,18 @@ class MapboxNativeNavigatorImpl(
         navigator.setFallbackVersionsObserver(fallbackVersionsObserver)
     }
 
-    override fun setNativeNavigatorRecreationObserver(
+    override fun addNativeNavigatorRecreationObserver(
         nativeNavigatorRecreationObserver: NativeNavigatorRecreationObserver,
     ) {
         nativeNavigatorRecreationObservers.add(nativeNavigatorRecreationObserver)
     }
 
+    override fun removeNativeNavigatorRecreationObserver(
+        nativeNavigatorRecreationObserver: NativeNavigatorRecreationObserver,
+    ) {
+        nativeNavigatorRecreationObservers.remove(nativeNavigatorRecreationObserver)
+    }
+
     private fun unregisterAllNativeNavigatorObservers() {
         navigator.setElectronicHorizonObserver(null)
         navigator.setFallbackVersionsObserver(null)

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ internal class MapboxTripSession(`
`299`	`299`	`}`
`300`	`300`
`301`	`301`	`init {`
`302`		`- navigator.setNativeNavigatorRecreationObserver {`
	`302`	`+ navigator.addNativeNavigatorRecreationObserver {`
`303`	`303`	`if (fallbackVersionsObservers.isNotEmpty()) {`
`304`	`304`	`navigator.setFallbackVersionsObserver(nativeFallbackVersionsObserver)`
`305`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ internal class EHorizonSubscriptionManagerImpl(`
`87`	`87`	`}`
`88`	`88`
`89`	`89`	`init {`
`90`		`- navigator.setNativeNavigatorRecreationObserver {`
	`90`	`+ navigator.addNativeNavigatorRecreationObserver {`
`91`	`91`	`if (eHorizonObservers.isNotEmpty()) {`
`92`	`92`	`setNavigatorObservers()`
`93`	`93`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class RoadObjectMatcher internal constructor(`
`32`	`32`	`private val roadObjectMatcherObservers = CopyOnWriteArraySet<RoadObjectMatcherObserver>()`
`33`	`33`
`34`	`34`	`init {`
`35`		`- navigator.setNativeNavigatorRecreationObserver {`
	`35`	`+ navigator.addNativeNavigatorRecreationObserver {`
`36`	`36`	`if (roadObjectMatcherObservers.isNotEmpty()) {`
`37`	`37`	`navigator.roadObjectMatcher.setListener(roadObjectMatcherListener)`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ internal class SystemLocaleWatcher private constructor(`
`34`	`34`	`ContextCompat.RECEIVER_NOT_EXPORTED,`
`35`	`35`	`)`
`36`	`36`
`37`		`- navigator.setNativeNavigatorRecreationObserver {`
	`37`	`+ navigator.addNativeNavigatorRecreationObserver {`
`38`	`38`	`navigator.setUserLanguages(context.deviceLanguageTags)`
`39`	`39`	`}`
`40`	`40`	`navigator.setUserLanguages(context.deviceLanguageTags)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class PredictiveCacheTests {`
`28`	`28`	`@Before`
`29`	`29`	`fun setUp() {`
`30`	`30`	`every {`
`31`		`- navigator.setNativeNavigatorRecreationObserver(`
	`31`	`+ navigator.addNativeNavigatorRecreationObserver(`
`32`	`32`	`capture(navigatorRecreationCallbackSlot),`
`33`	`33`	`)`
`34`	`34`	`} just Runs`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ class MapboxTripSessionTest {`
`200`	`200`	`navigator.addNavigatorObserver(capture(navigatorObserverImplSlot))`
`201`	`201`	`} answers {}`
`202`	`202`	`every {`
`203`		`- navigator.setNativeNavigatorRecreationObserver(`
	`203`	`+ navigator.addNativeNavigatorRecreationObserver(`
`204`	`204`	`capture(navigatorRecreationObserverImplSlot),`
`205`	`205`	`)`
`206`	`206`	`} answers {}`