Add check for empty queue

mapbox · May 31, 2018 · 954867c · 954867c
1 parent 26dc367
commit 954867c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/...on-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/NavigationViewModel.java b/...on-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/.../java/com/mapbox/services/android/navigation/ui/v5/voice/NavigationInstructionPlayer.java b/.../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();
     }
   }