Android: Stop trip session when detached + don't start foreground ser…

…vice
YoussefHenna · Sep 9, 2024 · 88b760b · 88b760b
1 parent cd18e4f
commit 88b760b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/android/src/main/java/expo/modules/mapboxnavigation/ExpoMapboxNavigationView.kt b/android/src/main/java/expo/modules/mapboxnavigation/ExpoMapboxNavigationView.kt
@@ -578,6 +578,9 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) : ExpoV
         mapboxNavigation?.unregisterVoiceInstructionsObserver(voiceInstructionsObserver)
         mapboxNavigation?.unregisterArrivalObserver(arrivalObserver)
         mapboxNavigation?.unregisterOffRouteObserver(offRouteObserver)
+        if(mapboxNavigation?.isDestroyed != true){
+            mapboxNavigation?.stopTripSession()
+        }
         speechApi.cancel()
         voiceInstructionsPlayer.shutdown()
         mapView.location.removeOnIndicatorPositionChangedListener(onIndicatorPositionChangedListener)
@@ -588,7 +591,7 @@ class ExpoMapboxNavigationView(context: Context, appContext: AppContext) : ExpoV
 
     private fun onRoutesReady(routes: List<NavigationRoute>){
         mapboxNavigation?.setNavigationRoutes(routes)
-        mapboxNavigation?.startTripSession()
+        mapboxNavigation?.startTripSession(withForegroundService=false)
         navigationCamera.requestNavigationCameraToFollowing(
             stateTransitionOptions = NavigationCameraTransitionOptions.Builder()
                 .maxDuration(0) // instant transition