Reset Navigator state

examples/src/main/java/com/mapbox/navigation/examples/core/FreeDriveNavigationActivity.kt

@@ -165,7 +165,7 @@ class FreeDriveNavigationActivity : AppCompatActivity(), OnMapReadyCallback {
             activityRef.get()?.navigationMapboxMap?.updateLocation(result.lastLocation)
         }
 
-        override fun onFailure(exception: java.lang.Exception) {
+        override fun onFailure(exception: Exception) {
             Timber.i(exception)
         }
     }

libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxNavigation.kt

@@ -302,7 +302,7 @@ constructor(
             Message("onDestroy")
         )
         MapboxNavigationTelemetry.unregisterListeners(this@MapboxNavigation)
-        directionsSession.shutdownSession()
+        directionsSession.shutdown()
         directionsSession.unregisterAllRoutesObservers()
         tripSession.stop()
         tripSession.unregisterAllLocationObservers()

libnavigation-core/src/main/java/com/mapbox/navigation/core/directions/session/DirectionsSession.kt

@@ -70,5 +70,5 @@ internal interface DirectionsSession {
     /**
      * Interrupts the route-fetching request
      */
-    fun shutdownSession()
+    fun shutdown()
 }

libnavigation-core/src/main/java/com/mapbox/navigation/core/directions/session/MapboxDirectionsSession.kt

@@ -150,7 +150,7 @@ internal class MapboxDirectionsSession(
     /**
      * Interrupt route-fetcher request
      */
-    override fun shutdownSession() {
+    override fun shutdown() {
         router.shutdown()
     }
 }

libnavigation-core/src/main/java/com/mapbox/navigation/core/internal/trip/session/MapboxTripSession.kt

@@ -184,6 +184,7 @@ class MapboxTripSession(
         enhancedLocation = null
         routeProgress = null
         isOffRoute = false
+        navigator.reset()
     }
 
     /**

libnavigation-core/src/test/java/com/mapbox/navigation/core/MapboxNavigationTest.kt

@@ -220,6 +220,13 @@ class MapboxNavigationTest {
         verify(exactly = 1) { tripSession.route = null }
     }
 
+    @Test
+    fun onDestroyCallsTripSessionStop() {
+        mapboxNavigation.onDestroy()
+
+        verify(exactly = 1) { tripSession.stop() }
+    }
+
     @Test
     fun unregisterAllBannerInstructionsObservers() {
         mapboxNavigation.onDestroy()

libnavigation-core/src/test/java/com/mapbox/navigation/core/directions/session/MapboxDirectionsSessionTest.kt

@@ -102,7 +102,7 @@ class MapboxDirectionsSessionTest {
 
     @Test
     fun shutDown() {
-        session.shutdownSession()
+        session.shutdown()
         verify { router.shutdown() }
     }
 

libnavigation-core/src/test/java/com/mapbox/navigation/core/internal/trip/session/MapboxTripSessionTest.kt

@@ -138,16 +138,33 @@ class MapboxTripSessionTest {
     }
 
     @Test
-    fun stopSession() {
+    fun stopSessionCallsTripServiceStopService() {
+        tripSession.start()
+
+        tripSession.stop()
+
+        verify { locationEngine.removeLocationUpdates(locationCallbackSlot.captured) }
+    }
+
+    @Test
+    fun stopSessionCallsLocationEngineRemoveLocationUpdates() {
         tripSession.start()
         locationCallbackSlot.captured.onSuccess(locationEngineResult)
 
         tripSession.stop()
 
-        verify { tripService.stopService() }
         verify { locationEngine.removeLocationUpdates(locationCallbackSlot.captured) }
     }
 
+    @Test
+    fun stopSessionCallsMapboxNativeNavigatorReset() {
+        tripSession.start()
+
+        tripSession.stop()
+
+        verify { navigator.reset() }
+    }
+
     @Test
     fun stopSessionDoesNotClearUpRoute() {
         tripSession.route = route

libnavigator/src/main/java/com/mapbox/navigation/navigator/internal/MapboxNativeNavigator.kt

@@ -251,4 +251,9 @@ interface MapboxNativeNavigator {
      * @return [VoiceInstruction] for step index you passed
      */
     fun getVoiceInstruction(index: Int): VoiceInstruction?
+
+    /**
+     * Reset resources.
+     */
+    fun reset()
 }

libnavigator/src/main/java/com/mapbox/navigation/navigator/internal/MapboxNativeNavigatorImpl.kt

@@ -53,7 +53,7 @@ object MapboxNativeNavigatorImpl : MapboxNativeNavigator {
     private const val TWO_LEGS: Short = 2
     private const val PRIMARY_ROUTE_INDEX = 0
 
-    private val navigator: Navigator = Navigator()
+    private var navigator: Navigator = Navigator()
     private var route: DirectionsRoute? = null
     private var routeBufferGeoJson: Geometry? = null
     private val mutex = Mutex()
@@ -323,6 +323,12 @@ object MapboxNativeNavigatorImpl : MapboxNativeNavigator {
     override fun getVoiceInstruction(index: Int): VoiceInstruction? =
         navigator.getVoiceInstruction(index)
 
+    /**
+     * Reset resources.
+     */
+    override fun reset() {
+        navigator = Navigator()
+    }
     /**
      * Builds [RouteProgress] object based on [NavigationStatus] returned by [Navigator]
      */