- * You can launch the UI with either a route you have already retrieved from - * {@link com.mapbox.services.android.navigation.v5.navigation.NavigationRoute} or you can pass a - * {@link Point} origin and {@link Point} destination and the UI will request the {@link DirectionsRoute} - * while initializing. - *
- * You have an option to include a AWS Cognito Pool ID, which will initialize the UI with AWS Polly Voice instructions + * You can launch the UI a route you have already retrieved from + * {@link com.mapbox.services.android.navigation.v5.navigation.NavigationRoute}. *
* For testing, you can launch with simulation, in which our * {@link com.mapbox.services.android.navigation.v5.location.MockLocationEngine} will begin - * following the given {@link DirectionsRoute} once the UI is initialized + * following the given {@link DirectionsRoute} once the UI is initialized. *
*/ public class NavigationLauncher { @@ -41,7 +36,7 @@ public static void startNavigation(Activity activity, NavigationLauncherOptions SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity); SharedPreferences.Editor editor = preferences.edit(); - storeRouteOptions(options, editor); + storeDirectionsRouteValue(options, editor); storeConfiguration(options, editor); storeThemePreferences(options, editor); @@ -67,13 +62,9 @@ static DirectionsRoute extractRoute(Context context) { return DirectionsRoute.fromJson(directionsRouteJson); } - private static void storeRouteOptions(NavigationLauncherOptions options, SharedPreferences.Editor editor) { - if (options.directionsRoute() != null) { - storeDirectionsRouteValue(options, editor); - } else { - throw new RuntimeException("A valid DirectionsRoute or origin and " - + "destination must be provided in NavigationViewOptions"); - } + private static void storeDirectionsRouteValue(NavigationLauncherOptions options, SharedPreferences.Editor editor) { + editor.putString(NavigationConstants.NAVIGATION_VIEW_ROUTE_KEY, new GsonBuilder() + .registerTypeAdapterFactory(DirectionsAdapterFactory.create()).create().toJson(options.directionsRoute())); } private static void storeConfiguration(NavigationLauncherOptions options, SharedPreferences.Editor editor) { @@ -96,9 +87,4 @@ private static void storeThemePreferences(NavigationLauncherOptions options, Sha } } } - - private static void storeDirectionsRouteValue(NavigationLauncherOptions options, SharedPreferences.Editor editor) { - editor.putString(NavigationConstants.NAVIGATION_VIEW_ROUTE_KEY, new GsonBuilder() - .registerTypeAdapterFactory(DirectionsAdapterFactory.create()).create().toJson(options.directionsRoute())); - } } diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java index 3e5c25e637e..9c07994887f 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java @@ -256,7 +256,6 @@ public void onProgressChange(Location location, RouteProgress routeProgress) { @Override public void userOffRoute(Location location) { if (hasNetworkConnection()) { - instructionPlayer.onOffRoute(); Point newOrigin = Point.fromLngLat(location.getLongitude(), location.getLatitude()); sendEventOffRoute(newOrigin); } diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/ViewRouteFetcher.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/ViewRouteFetcher.java index 21c2df5b398..c515bbb8c40 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/ViewRouteFetcher.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/ViewRouteFetcher.java @@ -77,10 +77,8 @@ public void updateRawLocation(@NonNull Location rawLocation) { private void extractRouteFromOptions(NavigationViewOptions options) { DirectionsRoute route = options.directionsRoute(); - if (route != null) { - cacheRouteInformation(options, route); - updateCurrentRoute(route); - } + cacheRouteInformation(options, route); + updateCurrentRoute(route); } private void cacheRouteInformation(NavigationViewOptions options, DirectionsRoute route) { diff --git a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationInstructionPlayer.java b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationInstructionPlayer.java index 2cc3b1ecbc5..bfaf2bf356c 100644 --- a/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationInstructionPlayer.java +++ b/libandroid-navigation-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationInstructionPlayer.java @@ -56,7 +56,7 @@ public void onDestroy() { @Override public void onStart() { requestAudioFocus(); - instructionQueue.remove(); + instructionQueue.poll(); } @Override @@ -69,7 +69,7 @@ public void onError(boolean isMapboxPlayer) { if (isMapboxPlayer) { androidSpeechPlayer.play(instructionQueue.peek().getAnnouncement()); } else { - instructionQueue.remove(); + instructionQueue.poll(); } } diff --git a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationConstants.java b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationConstants.java index 1b294e43688..510acb499dd 100644 --- a/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationConstants.java +++ b/libandroid-navigation/src/main/java/com/mapbox/services/android/navigation/v5/navigation/NavigationConstants.java @@ -184,13 +184,6 @@ private NavigationConstants() { */ public static final int NAVIGATION_HIGH_ALERT_DURATION = 15; - /** - * Constant used to store running state in navigation view. - * - * @since 0.10.0 - */ - public static final String NAVIGATION_VIEW_RUNNING = "navigation_view_running"; - /** * Default location acceptable accuracy threshold * used in {@link com.mapbox.services.android.navigation.v5.location.LocationValidator}.