diff --git a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetry.kt b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetry.kt index 9f347dce130..2a7f2b3245f 100644 --- a/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetry.kt +++ b/libnavigation-core/src/main/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetry.kt @@ -130,6 +130,8 @@ internal object MapboxNavigationTelemetry : logger: Logger?, locationsCollector: LocationsCollector = LocationsCollectorImpl(logger) ) { + reset() + sessionState = IDLE this.logger = logger this.locationsCollector = locationsCollector navigationOptions = options @@ -278,9 +280,7 @@ internal object MapboxNavigationTelemetry : if (dynamicValues.sessionStarted) { log("sessionStop") handleSessionCanceled() - dynamicValues.reset() - resetOriginalRoute() - resetRouteProgress() + reset() } } @@ -427,6 +427,14 @@ internal object MapboxNavigationTelemetry : } } + private fun reset() { + dynamicValues.reset() + resetOriginalRoute() + resetRouteProgress() + needHandleReroute = false + needStartSession = false + } + private fun resetRouteProgress() { log("resetRouteProgress") routeProgress = null diff --git a/libnavigation-core/src/test/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetryTest.kt b/libnavigation-core/src/test/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetryTest.kt index 0a0f86b1647..2899ea9fca0 100644 --- a/libnavigation-core/src/test/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetryTest.kt +++ b/libnavigation-core/src/test/java/com/mapbox/navigation/core/telemetry/MapboxNavigationTelemetryTest.kt @@ -36,7 +36,6 @@ import com.mapbox.navigation.core.telemetry.events.NavigationRerouteEvent import com.mapbox.navigation.metrics.MapboxMetricsReporter import com.mapbox.navigation.metrics.internal.event.NavigationAppUserTurnstileEvent import io.mockk.Runs -import io.mockk.coEvery import io.mockk.every import io.mockk.just import io.mockk.mockk @@ -47,10 +46,8 @@ import junit.framework.TestCase.assertEquals import junit.framework.TestCase.assertNotSame import junit.framework.TestCase.assertTrue import org.junit.After -import org.junit.Ignore import org.junit.Test -@Ignore class MapboxNavigationTelemetryTest { private companion object { @@ -592,7 +589,7 @@ class MapboxNavigationTelemetryTest { } private fun mockLocationCollector() { - coEvery { locationsCollector.flushBuffers() } just Runs + every { locationsCollector.flushBuffers() } just Runs every { locationsCollector.lastLocation } returns lastLocation every { lastLocation.latitude } returns LAST_LOCATION_LAT every { lastLocation.longitude } returns LAST_LOCATION_LON