Add synchronization when accessing waypoints in ChartView

MyTracks/src/com/google/android/apps/mytracks/ChartView.java

@@ -309,15 +309,19 @@ public class ChartView extends View {
    * @param waypoint the waypoint
    */
   public void addWaypoint(Waypoint waypoint) {
+    synchronized (waypoints) {
       waypoints.add(waypoint);
     }
+  }
 
   /**
    * Clears the waypoints.
    */
   public void clearWaypoints() {
+    synchronized (waypoints) {
       waypoints.clear();
     }
+  }
 
   /**
    * Returns true if can zoom in.
@@ -445,6 +449,7 @@ public class ChartView extends View {
         if (Math.abs(event.getY() - topBorder - spacer - markerHeight / 2) < markerHeight) {
           int minDistance = Integer.MAX_VALUE;
           Waypoint nearestWaypoint = null;
+          synchronized (waypoints) {
             for (int i = 0; i < waypoints.size(); i++) {
               Waypoint waypoint = waypoints.get(i);
               int distance = Math.abs(
@@ -454,6 +459,7 @@ public class ChartView extends View {
                 nearestWaypoint = waypoint;
               }
             }
+          }
           if (nearestWaypoint != null && minDistance < markerWidth) {
             Intent intent = IntentUtils.newIntent(getContext(), MarkerDetailActivity.class)
                 .putExtra(MarkerDetailActivity.EXTRA_MARKER_ID, nearestWaypoint.getId());
@@ -543,6 +549,7 @@ public class ChartView extends View {
    * @param canvas the canvas
    */
   private void drawWaypoints(Canvas canvas) {
+    synchronized (waypoints) {
       for (int i = 0; i < waypoints.size(); i++) {
         final Waypoint waypoint = waypoints.get(i);
         if (waypoint.getLocation() == null) {
@@ -556,8 +563,8 @@ public class ChartView extends View {
         float x = getX(getWaypointXValue(waypoint));
         canvas.drawLine(
             x, topBorder + spacer + markerHeight / 2, x, topBorder + effectiveHeight, markerPaint);
-      canvas.translate(x - (float) (markerWidth * MapOverlay.WAYPOINT_X_ANCHOR),
+        canvas.translate(
-          topBorder + spacer);
+            x - (float) (markerWidth * MapOverlay.WAYPOINT_X_ANCHOR), topBorder + spacer);
         if (waypoints.get(i).getType() == Waypoint.TYPE_STATISTICS) {
           statisticsMarker.draw(canvas);
         } else {
@@ -566,6 +573,7 @@ public class ChartView extends View {
         canvas.restore();
       }
     }
+  }
 
   /**
    * Draws the grid.