add check to avoid array index out of bounds exceptions from map rout…

…e line draw way points (#1951)
mapbox · May 29, 2019 · d447d41 · d447d41
1 parent 92ab4eb
commit d447d41
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@ Mapbox welcomes participation and contributions from everyone.
 
 ### v0.39.0 - May 29, 2019
 
+* Add check to avoid ArrayIndexOutOfBoundsExceptions from MapRouteLine#drawWayPoints [#1951](https://github.com/mapbox/mapbox-navigation-android/pull/1951)
 * Fix way name truncating too soon [#1947](https://github.com/mapbox/mapbox-navigation-android/pull/1947)
 * Fix instruction icon mismatch in between banner and notification [#1946](https://github.com/mapbox/mapbox-navigation-android/pull/1946)
 

diff --git a/...c/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListener.java b/...c/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteClickListener.java
@@ -70,7 +70,7 @@ private void findClickedRoute(@NonNull LatLng point, HashMap<LineString, Directi
   }
 
   private void calculateClickDistances(HashMap<Double, DirectionsRoute> routeDistancesAwayFromClick,
-                                          Point clickPoint, HashMap<LineString, DirectionsRoute> routeLineStrings) {
+                                       Point clickPoint, HashMap<LineString, DirectionsRoute> routeLineStrings) {
     for (LineString lineString : routeLineStrings.keySet()) {
       Point pointOnLine = findPointOnLine(clickPoint, lineString);
       if (pointOnLine == null) {

diff --git a/...ion-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLine.java b/...ion-ui/src/main/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLine.java
@@ -202,7 +202,7 @@ List<DirectionsRoute> retrieveDirectionsRoutes() {
 
   boolean updatePrimaryRouteIndex(int primaryRouteIndex) {
     boolean isNewIndex = this.primaryRouteIndex != primaryRouteIndex
-      && primaryRouteIndex < directionsRoutes.size();
+      && primaryRouteIndex < directionsRoutes.size() && primaryRouteIndex >= 0;
     if (isNewIndex) {
       this.primaryRouteIndex = primaryRouteIndex;
       updateRoutesFor(primaryRouteIndex);

diff --git a/...ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLineTest.java b/...ui/src/test/java/com/mapbox/services/android/navigation/ui/v5/route/MapRouteLineTest.java
@@ -26,6 +26,9 @@
 import edu.emory.mathcs.backport.java.util.Collections;
 
 import static com.mapbox.services.android.navigation.ui.v5.route.RouteConstants.ROUTE_LAYER_ID;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyFloat;
 import static org.mockito.ArgumentMatchers.anyInt;
@@ -110,6 +113,44 @@ public void updatePrimaryIndex_routeLineSourceIsSet() throws IOException {
     verify(routeLineSource, times(4)).setGeoJson(any(FeatureCollection.class));
   }
 
+  @Test
+  public void updatePrimaryIndex_newPrimaryRouteIndexUpdated() throws IOException {
+    GeoJsonSource mockedRouteLineSource = mock(GeoJsonSource.class);
+    GeoJsonSource mockedWayPointSource = mock(GeoJsonSource.class);
+    List<Layer> anyRouteLayers = buildMockLayers();
+    List<DirectionsRoute> routes = new ArrayList<>();
+    routes.add(buildTestDirectionsRoute());
+    routes.add(buildTestDirectionsRoute());
+    routes.add(buildTestDirectionsRoute());
+    routes.add(buildTestDirectionsRoute());
+    MapRouteLine routeLine = new MapRouteLine(mockedRouteLineSource, mockedWayPointSource, anyRouteLayers);
+    routeLine.draw(routes);
+
+    boolean isNewIndex = routeLine.updatePrimaryRouteIndex(3);
+
+    assertTrue(isNewIndex);
+    assertEquals(3, routeLine.retrievePrimaryRouteIndex());
+  }
+
+  @Test
+  public void updatePrimaryIndex_newPrimaryRouteIndexIsNotUpdated() throws IOException {
+    GeoJsonSource mockedRouteLineSource = mock(GeoJsonSource.class);
+    GeoJsonSource mockedWayPointSource = mock(GeoJsonSource.class);
+    List<Layer> anyRouteLayers = buildMockLayers();
+    List<DirectionsRoute> routes = new ArrayList<>();
+    routes.add(buildTestDirectionsRoute());
+    routes.add(buildTestDirectionsRoute());
+    routes.add(buildTestDirectionsRoute());
+    routes.add(buildTestDirectionsRoute());
+    MapRouteLine routeLine = new MapRouteLine(mockedRouteLineSource, mockedWayPointSource, anyRouteLayers);
+    routeLine.draw(routes);
+
+    boolean isNewIndex = routeLine.updatePrimaryRouteIndex(-1);
+
+    assertFalse(isNewIndex);
+    assertEquals(0, routeLine.retrievePrimaryRouteIndex());
+  }
+
   @Test
   public void routeLineCap_defaultIsSet() {
     Context context = mock(Context.class);