Properly handling invalid track/point/waypoint IDs.

This makes the provider utils implementation return null for those cases, and fixes all callers which didn't check for that.

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

@@ -144,6 +144,7 @@ public class ChartActivity extends Activity implements TrackDataListener {
 
     dataHub.registerTrackDataListener(this, EnumSet.of(
         ListenerDataType.SELECTED_TRACK_CHANGED,
+        ListenerDataType.TRACK_UPDATES,
         ListenerDataType.POINT_UPDATES,
         ListenerDataType.SAMPLED_OUT_POINT_UPDATES,
         ListenerDataType.WAYPOINT_UPDATES,

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

@@ -189,6 +189,11 @@ public class ExportAllTracks {
         Log.i(Constants.TAG, "ExportAllTracks: exporting: " + id);
         TrackWriter writer =
             TrackWriterFactory.newWriter(activity, providerUtils, id, format);
+        if (writer == null) {
+          showToast(R.string.error_track_does_not_exist, Toast.LENGTH_LONG);
+          return;
+        }
+
         writer.writeTrack();
 
         if (!writer.wasSuccess()) {

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

@@ -963,8 +963,12 @@ public class MyTracks extends TabActivity implements OnTouchListener,
           // Update the map id for this track:
           try {
             Track track = providerUtils.getTrack(trackId);
-            track.setMapId(mapId);
+            if (track != null) {
-            providerUtils.updateTrack(track);
+              track.setMapId(mapId);
+              providerUtils.updateTrack(track);
+            } else {
+              Log.w(TAG, "Updating map id failed.");
+            }
           } catch (RuntimeException e) {
             // If that fails whatever reasons we'll just log an error, but
             // continue.
@@ -1017,8 +1021,12 @@ public class MyTracks extends TabActivity implements OnTouchListener,
           // Update the table id for this track:
           try {
             Track track = providerUtils.getTrack(trackId);
-            track.setTableId(tableId);
+            if (track != null) {
-            providerUtils.updateTrack(track);
+              track.setTableId(tableId);
+              providerUtils.updateTrack(track);
+            } else {
+              Log.w(TAG, "Updating table id failed.");
+            }
           } catch (RuntimeException e) {
             // If that fails whatever reasons we'll just log an error, but
             // continue.
@@ -1228,6 +1236,11 @@ public class MyTracks extends TabActivity implements OnTouchListener,
    */
   public void saveTrack(long trackId, TrackFileFormat format) {
     TrackWriter writer = TrackWriterFactory.newWriter(this, providerUtils, trackId, format);
+    if (writer == null) {
+      dialogManager.showMessageDialog(R.string.error_track_does_not_exist, false);
+      return;
+    }
+
     WriteProgressController controller = new WriteProgressController(this, writer);
     controller.setOnCompletionListener(new WriteProgressController.OnCompletionListener() {
       @Override
@@ -1247,6 +1260,10 @@ public class MyTracks extends TabActivity implements OnTouchListener,
    */
   public void sendTrack(long trackId, final TrackFileFormat format) {
     TrackWriter writer = TrackWriterFactory.newWriter(this, providerUtils, trackId, format);
+    if (writer == null) {
+      dialogManager.showMessageDialog(R.string.error_track_does_not_exist, false);
+      return;
+    }
 
     FileUtils fileUtils = new FileUtils();
     String extension = format.getExtension();

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

@@ -73,15 +73,18 @@ public class WaypointsList extends ListActivity
           contextPosition = info.position;
           waypointId = WaypointsList.this.listView.getAdapter()
               .getItemId(contextPosition);
-          int type = providerUtils.getWaypoint(info.id).getType();
+          Waypoint waypoint = providerUtils.getWaypoint(info.id);
-          menu.add(0, Constants.MENU_SHOW, 0,
+          if (waypoint != null) {
-              R.string.waypointslist_show_waypoint);
+            int type = waypoint.getType();
-          menu.add(0, Constants.MENU_EDIT, 0,
+            menu.add(0, Constants.MENU_SHOW, 0,
-              R.string.waypointslist_edit_waypoint);
+                R.string.waypointslist_show_waypoint);
-          menu.add(0, Constants.MENU_DELETE, 0,
+            menu.add(0, Constants.MENU_EDIT, 0,
-              R.string.waypointslist_delete_waypoint).setEnabled(
+                R.string.waypointslist_edit_waypoint);
-                  recordingTrackId < 0 || type == Waypoint.TYPE_WAYPOINT ||
+            menu.add(0, Constants.MENU_DELETE, 0,
-                  info.id != providerUtils.getLastWaypointId(recordingTrackId));
+                R.string.waypointslist_delete_waypoint).setEnabled(
+                    recordingTrackId < 0 || type == Waypoint.TYPE_WAYPOINT ||
+                    info.id != providerUtils.getLastWaypointId(recordingTrackId));
+          }
         }
       };
 

MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java

@@ -17,10 +17,10 @@ package com.google.android.apps.mytracks.content;
 
 import static com.google.android.apps.mytracks.Constants.DEFAULT_MIN_REQUIRED_ACCURACY;
 import static com.google.android.apps.mytracks.Constants.MAX_DISPLAYED_WAYPOINTS_POINTS;
-import static com.google.android.apps.mytracks.Constants.TARGET_DISPLAYED_TRACK_POINTS;
 import static com.google.android.apps.mytracks.Constants.MAX_LOCATION_AGE_MS;
 import static com.google.android.apps.mytracks.Constants.MAX_NETWORK_AGE_MS;
 import static com.google.android.apps.mytracks.Constants.TAG;
+import static com.google.android.apps.mytracks.Constants.TARGET_DISPLAYED_TRACK_POINTS;
 
 import com.google.android.apps.mytracks.content.DataSourceManager.DataSourceListener;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils.DoubleBufferedLocationFactory;
@@ -40,7 +40,6 @@ import android.location.LocationManager;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.util.Log;
-import android.widget.Toast;
 
 import java.util.Collections;
 import java.util.EnumSet;
@@ -791,10 +790,6 @@ public class TrackDataHub {
       public void run() {
         for (TrackDataListener listener : listeners) {
           listener.onSelectedTrackChanged(track, isRecordingSelected());
-
-          if (track != null) {
-            listener.onTrackUpdated(track);
-          }
         }
       }
     });

MyTracks/src/com/google/android/apps/mytracks/io/SendToFusionTables.java

@@ -179,6 +179,11 @@ public class SendToFusionTables implements Runnable {
 
       // Get the track meta-data
       Track track = providerUtils.getTrack(trackId);
+      if (track == null) {
+        Log.w(Constants.TAG, "Cannot get track.");
+        return;
+      }
+
       String originalDescription = track.getDescription();
 
       // Create a new table:
@@ -207,7 +212,6 @@ public class SendToFusionTables implements Runnable {
       Log.d(Constants.TAG, "SendToFusionTables: Done: " + success);
       progressIndicator.setProgressValue(PROGRESS_COMPLETE);
     } finally {
-
       final boolean finalSuccess = success;
       final int finalStatusMessageId = statusMessageId;
       context.runOnUiThread(new Runnable() {
@@ -304,7 +308,7 @@ public class SendToFusionTables implements Runnable {
 
     Cursor locationsCursor = providerUtils.getLocationsCursor(track.getId(), 0, -1, false);
     try {
-      if (!locationsCursor.moveToFirst()) {
+      if (locationsCursor == null || !locationsCursor.moveToFirst()) {
         Log.w(Constants.TAG, "Unable to get any points to upload");
         return false;
       }
@@ -391,7 +395,9 @@ public class SendToFusionTables implements Runnable {
 
       return true;
     } finally {
-      locationsCursor.close();
+      if (locationsCursor != null) {
+        locationsCursor.close();
+      }
     }
   }
 

MyTracks/src/com/google/android/apps/mytracks/io/SendToMyMaps.java

@@ -106,6 +106,11 @@ public class SendToMyMaps implements Runnable {
 
       // Get the track meta-data
       Track track = providerUtils.getTrack(trackId);
+      if (track == null) {
+        Log.w(Constants.TAG, "Cannot get track.");
+        return;
+      }
+
       String originalDescription = track.getDescription();
       track.setDescription("<p>" + track.getDescription() + "</p><p>"
           + stringUtils.generateTrackDescription(track, null, null) + "</p>");
@@ -206,7 +211,7 @@ public class SendToMyMaps implements Runnable {
     Cursor locationsCursor =
         providerUtils.getLocationsCursor(track.getId(), 0, -1, false);
     try {
-      if (!locationsCursor.moveToFirst()) {
+      if (locationsCursor == null || !locationsCursor.moveToFirst()) {
         Log.w(TAG, "Unable to get any points to upload");
         return false;
       }
@@ -297,7 +302,9 @@ public class SendToMyMaps implements Runnable {
 
       return true;
     } finally {
-      locationsCursor.close();
+      if (locationsCursor != null) {
+        locationsCursor.close();
+      }
     }
   }
 

MyTracks/src/com/google/android/apps/mytracks/io/file/TrackWriterFactory.java

@@ -16,10 +16,13 @@
 
 package com.google.android.apps.mytracks.io.file;
 
+import static com.google.android.apps.mytracks.Constants.TAG;
+
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.Track;
 
 import android.content.Context;
+import android.util.Log;
 
 /**
  * A factory to produce track writers for any format.
@@ -90,6 +93,11 @@ public class TrackWriterFactory {
       MyTracksProviderUtils providerUtils,
       long trackId, TrackFileFormat format) {
     Track track = providerUtils.getTrack(trackId);
+    if (track == null) {
+      Log.w(TAG, "Trying to create a writer for an invalid track, id=" + trackId);
+      return null;
+    }
+
     return newWriter(context, providerUtils, track, format);
   }
 

MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java

@@ -660,6 +660,10 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
 
   @Override
   public Waypoint getFirstWaypoint(long trackId) {
+    if (trackId <= 0) {
+      return null;
+    }
+
     Cursor cursor = contentResolver.query(
         WaypointsColumns.CONTENT_URI,
         null /*projection*/,
@@ -682,6 +686,10 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
 
   @Override
   public Waypoint getWaypoint(long waypointId) {
+    if (waypointId < 0) {
+      return null;
+    }
+
     Cursor cursor = contentResolver.query(
         WaypointsColumns.CONTENT_URI,
         null /*projection*/,
@@ -704,6 +712,10 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
 
   @Override
   public long getLastLocationId(long trackId) {
+    if (trackId < 0) {
+      return -1;
+    }
+
     final String[] projection = {"_id"};
     Cursor cursor = contentResolver.query(
         TrackPointsColumns.CONTENT_URI,
@@ -728,6 +740,10 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
 
   @Override
   public long getFirstWaypointId(long trackId) {
+    if (trackId < 0) {
+      return -1;
+    }
+
     final String[] projection = {"_id"};
     Cursor cursor = contentResolver.query(
         WaypointsColumns.CONTENT_URI,
@@ -752,6 +768,10 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
 
   @Override
   public long getLastWaypointId(long trackId) {
+    if (trackId < 0) {
+      return -1;
+    }
+
     final String[] projection = {"_id"};
     Cursor cursor = contentResolver.query(
         WaypointsColumns.CONTENT_URI,
@@ -815,6 +835,10 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
 
   @Override
   public Location getLocation(long id) {
+    if (id < 0) {
+      return null;
+    }
+
     String selection = TrackPointsColumns._ID + "=" + id;
     return findLocationBy(selection);
   }
@@ -822,6 +846,10 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
   @Override
   public Cursor getLocationsCursor(long trackId, long minTrackPointId,
       int maxLocations, boolean descending) {
+    if (trackId < 0 || maxLocations < 1) {
+      return null;
+    }
+
     String selection;
     if (minTrackPointId >= 0) {
       selection = String.format("%s=%d AND %s%s%d",
@@ -842,6 +870,10 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
   @Override
   public Cursor getWaypointsCursor(long trackId, long minWaypointId,
       int maxWaypoints) {
+    if (trackId < 0 || maxWaypoints < 1) {
+      return null;
+    }
+
     String selection;
     if (minWaypointId > 0) {
       selection = String.format("%s=%d AND %s>=%d",
@@ -863,6 +895,10 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
 
   @Override
   public Track getTrack(long id) {
+    if (id < 0) {
+      return null;
+    }
+
     String select = TracksColumns._ID + "=" + id;
     return findTrackBy(select);
   }
@@ -929,6 +965,10 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
 
   @Override
   public boolean trackExists(long id) {
+    if (id < 0) {
+      return false;
+    }
+
     Cursor cursor = null;
     try {
       final String[] projection = { TracksColumns._ID };