Skip to content

Follow up with fixes for 7349 #7357

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Follow up with fixes for 7349 #7357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions libnavigation-core/src/main/java/com/mapbox/navigation/core/MapboxNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,15 +470,7 @@ class MapboxNavigation @VisibleForTesting internal constructor(
tilesVersion = navigationOptions.routingTilesOptions.tilesVersion
),
navigationOptions.accessToken ?: "",
if (moduleRouter.isInternalImplementation()) {
// We pass null to let NN know that default router is used and it can rely
// on implementation details in some cases like offline-online switch.
// Meanwhile platform SDK uses its own instance of native router for
// route requests
null
} else {
RouterInterfaceAdapter(moduleRouter, ::getNavigationRoutes)
},
getRouterInterfaceForNativeNavigator()
)
etcGateAPI = EtcGateApi(navigator.experimental)

Expand Down Expand Up @@ -620,6 +612,18 @@ class MapboxNavigation @VisibleForTesting internal constructor(
roadObjectMatcher = RoadObjectMatcher(navigator)
}

private fun getRouterInterfaceForNativeNavigator(): RouterInterface? {
return if (moduleRouter.isInternalImplementation()) {
// We pass null to let NN know that default router is used and it can rely
// on implementation details in some cases like offline-online switch.
// Meanwhile platform SDK uses its own instance of native router for
// route requests
null
} else {
RouterInterfaceAdapter(moduleRouter, ::getNavigationRoutes)
}
}

/**
* Control the location events playback during a replay trip session.
* Start a replay trip session with [startReplayTripSession].
Expand Down Expand Up @@ -2033,11 +2037,7 @@ class MapboxNavigation @VisibleForTesting internal constructor(
historyRecorderHandles.composite,
createTilesConfig(isFallback, tilesVersion),
navigationOptions.accessToken ?: "",
if (moduleRouter.isInternalImplementation()) {
nativeRouter
} else {
RouterInterfaceAdapter(moduleRouter, ::getNavigationRoutes)
},
getRouterInterfaceForNativeNavigator()
)
etcGateAPI.experimental = navigator.experimental
assignHistoryRecorders()
Expand Down
2 changes: 1 addition & 1 deletion libnavigator/src/main/java/com/mapbox/navigation/navigator/internal/MapboxNativeNavigator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ interface MapboxNativeNavigator {
historyRecorderComposite: HistoryRecorderHandle?,
tilesConfig: TilesConfig,
accessToken: String,
router: RouterInterface,
router: RouterInterface?,
)

suspend fun resetRideSession()
Expand Down
2 changes: 1 addition & 1 deletion ...gator/src/main/java/com/mapbox/navigation/navigator/internal/MapboxNativeNavigatorImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ object MapboxNativeNavigatorImpl : MapboxNativeNavigator {
historyRecorderComposite: HistoryRecorderHandle?,
tilesConfig: TilesConfig,
accessToken: String,
router: RouterInterface
router: RouterInterface?
) {
val storeNavSessionState = navigator!!.storeNavigationSession()
create(config, historyRecorderComposite, tilesConfig, accessToken, router)
Expand Down