update from comments

Author: kmadsen

libnavigation-core/api/current.txt

@@ -1025,7 +1025,6 @@ package com.mapbox.navigation.core.telemetry.events {
 package com.mapbox.navigation.core.trip {
 
   @com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI public final class MapboxTripStarter implements com.mapbox.navigation.core.lifecycle.MapboxNavigationObserver {
-    method public static com.mapbox.navigation.core.trip.MapboxTripStarter create();
     method public com.mapbox.navigation.core.trip.MapboxTripStarterOptions getOptions();
     method public static com.mapbox.navigation.core.trip.MapboxTripStarter getRegisteredInstance();
     method public void onAttached(com.mapbox.navigation.core.MapboxNavigation mapboxNavigation);
@@ -1036,7 +1035,6 @@ package com.mapbox.navigation.core.trip {
   }
 
   public static final class MapboxTripStarter.Companion {
-    method public com.mapbox.navigation.core.trip.MapboxTripStarter create();
     method public com.mapbox.navigation.core.trip.MapboxTripStarter getRegisteredInstance();
   }
 

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

@@ -25,11 +25,11 @@ import kotlinx.coroutines.launch
  * permissions change, so you must notify it of changes. It will check location permissions upon
  * attach. The location permissions are not required for replay sessions.
  *
- * In order to share the state between an App and Android Auto, it is recommended to make this
- * class a singleton. That will be done automatically if you use [getRegisteredInstance].
+ * In order to share the state between an App and Android Auto, the instance of this class should
+ * be shared. That will be done automatically if you use [getRegisteredInstance].
  */
 @ExperimentalPreviewMapboxNavigationAPI
-class MapboxTripStarter private constructor() : MapboxNavigationObserver {
+class MapboxTripStarter internal constructor() : MapboxNavigationObserver {
 
     private val optionsFlow = MutableStateFlow(MapboxTripStarterOptions.Builder().build())
     private var replayRouteTripSession: ReplayRouteSession? = null
@@ -106,7 +106,7 @@ class MapboxTripStarter private constructor() : MapboxNavigationObserver {
         if (granted && !PermissionsManager.areLocationPermissionsGranted(context)) {
             error(
                 "updateLocationPermissions can only be set to true when location permissions" +
-                    " have been accepted."
+                    " are granted."
             )
         }
     }
@@ -154,18 +154,12 @@ class MapboxTripStarter private constructor() : MapboxNavigationObserver {
 
     companion object {
 
-        /**
-         * Construct an instance without registering to [MapboxNavigationApp].
-         */
-        @JvmStatic
-        fun create() = MapboxTripStarter()
-
         /**
          * Get the registered instance or create one and register it to [MapboxNavigationApp].
          */
         @JvmStatic
         fun getRegisteredInstance(): MapboxTripStarter = MapboxNavigationApp
             .getObservers(MapboxTripStarter::class)
-            .firstOrNull() ?: create().also { MapboxNavigationApp.registerObserver(it) }
+            .firstOrNull() ?: MapboxTripStarter().also { MapboxNavigationApp.registerObserver(it) }
     }
 }

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

@@ -16,7 +16,7 @@ import org.junit.Test
 @OptIn(ExperimentalPreviewMapboxNavigationAPI::class)
 class MapboxTripStarterTest {
 
-    private val sut = MapboxTripStarter.create()
+    private val sut = MapboxTripStarter()
 
     @Before
     fun setup() {

libnavui-dropin/src/test/java/com/mapbox/navigation/dropin/navigationview/MapboxNavigationViewApiTest.kt

@@ -1,7 +1,10 @@
 package com.mapbox.navigation.dropin.navigationview
 
 import com.mapbox.geojson.Point
+import com.mapbox.navigation.base.ExperimentalPreviewMapboxNavigationAPI
 import com.mapbox.navigation.base.route.NavigationRoute
+import com.mapbox.navigation.core.MapboxNavigation
+import com.mapbox.navigation.core.lifecycle.MapboxNavigationApp
 import com.mapbox.navigation.dropin.NavigationViewApiErrorTypes
 import com.mapbox.navigation.dropin.util.TestStore
 import com.mapbox.navigation.ui.app.internal.Reducer
@@ -19,7 +22,7 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.spyk
-import io.mockk.unmockkObject
+import io.mockk.unmockkAll
 import io.mockk.verify
 import org.junit.After
 import org.junit.Assert.assertEquals
@@ -54,6 +57,9 @@ class MapboxNavigationViewApiTest {
             }
         )
 
+        mockkObject(MapboxNavigationApp)
+        every { MapboxNavigationApp.current() } returns null
+
         mockkObject(MapboxAudioGuidance.Companion)
         every { MapboxAudioGuidance.getRegisteredInstance() } returns audioGuidance
 
@@ -62,7 +68,7 @@ class MapboxNavigationViewApiTest {
 
     @After
     fun cleanUp() {
-        unmockkObject(MapboxAudioGuidance.Companion)
+        unmockkAll()
     }
 
     @Test
@@ -325,14 +331,15 @@ class MapboxNavigationViewApiTest {
         assertEquals(NavigationViewApiErrorTypes.InvalidRoutesInfo, result.error?.type)
     }
 
+    @OptIn(ExperimentalPreviewMapboxNavigationAPI::class)
     @Test
     fun `isReplayEnabled should return true when replay trip session is enabled `() {
+        val mapboxNavigation = mockk<MapboxNavigation>()
+        every { MapboxNavigationApp.current() } returns mapboxNavigation
+
+        every { mapboxNavigation.isReplayEnabled() } returns false
         assertFalse(sut.isReplayEnabled())
-        testStore.updateState {
-            it.copy(
-                tripSession = it.tripSession.copy(isReplayRouteEnabled = true)
-            )
-        }
+        every { mapboxNavigation.isReplayEnabled() } returns true
         assertTrue(sut.isReplayEnabled())
     }
 

libnavui-dropin/src/test/java/com/mapbox/navigation/dropin/permission/LocationPermissionComponentTest.kt

@@ -12,7 +12,6 @@ import com.mapbox.android.core.permissions.PermissionsManager
 import com.mapbox.navigation.core.MapboxNavigation
 import com.mapbox.navigation.dropin.util.TestStore
 import com.mapbox.navigation.testing.MainCoroutineRule
-import com.mapbox.navigation.ui.app.internal.State
 import com.mapbox.navigation.ui.app.internal.tripsession.TripSessionStarterAction
 import io.mockk.every
 import io.mockk.mockk
@@ -175,13 +174,6 @@ class LocationPermissionComponentTest {
                 componentActivity,
                 testStore
             )
-            testStore.setState(
-                State(
-                    tripSession = mockk {
-                        every { isLocationPermissionGranted } returns false
-                    }
-                )
-            )
             every { PermissionsManager.areLocationPermissionsGranted(any()) } returns false
 
             locationPermissionComponent.onAttached(mockMapboxNavigation())