Always provide DirectionsRoute in NavigationActivity #980
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
devotaaabel
approved these changes
May 31, 2018
| @@ -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) { | |||
There was a problem hiding this comment.
why remove null check?
| @@ -77,10 +77,8 @@ public void updateRawLocation(@NonNull Location rawLocation) { | |||
|
|
|||
| private void extractRouteFromOptions(NavigationViewOptions options) { | |||
| DirectionsRoute route = options.directionsRoute(); | |||
| if (route != null) { | |||
There was a problem hiding this comment.
why remove null check?
devotaaabel
suggested changes
May 31, 2018
| @@ -56,7 +56,7 @@ public void onDestroy() { | |||
| @Override | |||
| public void onStart() { | |||
| requestAudioFocus(); | |||
| instructionQueue.remove(); | |||
There was a problem hiding this comment.
You can just do instructionQueue.poll which is the empty-safe version of remove
| @@ -69,7 +69,7 @@ public void onError(boolean isMapboxPlayer) { | |||
| if (isMapboxPlayer) { | |||
| androidSpeechPlayer.play(instructionQueue.peek().getAnnouncement()); | |||
| } else { | |||
| instructionQueue.remove(); | |||
danesfeder
force-pushed
the
dan-options-rotation
branch
from
14cef8f
to
954867c
Compare
devotaaabel
approved these changes
May 31, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
NavigationLauncherOptionsnow requires aDirectionsRouteevery time you build an instance.This PR updates
NavigationActivityto always provide the original route stored inSharedPreferences. This is okay because, when initializing, theNavigationViewModelignores the route provided if it's already running (after rotation it will be already running because the view model survives rotation).