upstream-mirrors/OpenTracks
1
0
Fork 1
mirror of https://codeberg.org/OpenTracksApp/OpenTracks.git synced 2026-10-09 04:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

merge heads

Browse Source
This commit is contained in:
Jimmy Shih
2012-04-24 09:55:17 -07:00
parent 352137c440 920f8e4180
commit 5a32550f85
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MyTracksLib/src/com/google/android/apps/mytracks/content/MyTracksProviderUtilsImpl.java
+8 -5
View File
@@ -851,12 +851,15 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
} }
String selection; String selection;
String[] selectionArgs;
if (minTrackPointId >= 0) { if (minTrackPointId >= 0) {
selection = String.format("%s=%d AND %s%s%d", String comparison = descending ? "<=" : ">=";
TrackPointsColumns.TRACKID, trackId, TrackPointsColumns._ID, selection = TrackPointsColumns.TRACKID + "=? AND " + TrackPointsColumns._ID + comparison
descending ? "<=" : ">=", minTrackPointId); + "?";
selectionArgs = new String[] { String.valueOf(trackId), String.valueOf(minTrackPointId) };
} else { } else {
selection = String.format("%s=%d", TrackPointsColumns.TRACKID, trackId); selection = TrackPointsColumns.TRACKID + "=?";
selectionArgs = new String[] { String.valueOf(trackId) };
} }
String sortOrder = "_id " + (descending ? "DESC" : "ASC"); String sortOrder = "_id " + (descending ? "DESC" : "ASC");
@@ -864,7 +867,7 @@ public class MyTracksProviderUtilsImpl implements MyTracksProviderUtils {
sortOrder += " LIMIT " + maxLocations; sortOrder += " LIMIT " + maxLocations;
} }
return contentResolver.query(TrackPointsColumns.CONTENT_URI, null, selection, null, sortOrder); return contentResolver.query(TrackPointsColumns.CONTENT_URI, null, selection, selectionArgs, sortOrder);
} }
@Override @Override