diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml index cea64915ab4..b9d670384f3 100644 --- a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml +++ b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml @@ -18,5 +18,11 @@ SAP Sailing Tracker gestoppt Scan Race Barcode GPS Fix Interval + Regatta + GPS Tracker gestartetp + Hello wörld! + Einstellungen + Bitte bestätigen + Soll das Tracking wirklich beendet werden? \ No newline at end of file diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java index f0dd4611a2d..fd7b95f918b 100644 --- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java +++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/provider/AnalyticsProvider.java @@ -189,8 +189,21 @@ public class AnalyticsProvider extends ContentProvider { + Arrays.toString(selectionArgs); ExLog.i(getContext(), TAG, message); } + + final SQLiteDatabase db = mOpenHelper.getWritableDatabase(); - return 0; + switch (sUriMatcher.match(uri)) { + + case SENSOR_GPS_ID: + String idStr = uri.getLastPathSegment(); + String where = SensorGps._ID + " = " + idStr; + int numRowsDeleted = db.delete(Tables.SENSOR_GPS, where, selectionArgs); + notifyChange(uri); + return numRowsDeleted; + + default: + throw new UnsupportedOperationException("Unknown uri: " + uri); + } } @Override diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TransmittingService.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TransmittingService.java index 41665d7986d..74a03a72557 100644 --- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TransmittingService.java +++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/services/TransmittingService.java @@ -156,17 +156,30 @@ public class TransmittingService extends Service { } } - private void markAsSynced(String[] fixIdStrings) + private void deleteSynced(String[] fixIdStrings) { for (String idStr: fixIdStrings) { ContentValues updateValues = new ContentValues(); updateValues.put(SensorGps.GPS_SYNCED, 1); Uri uri = ContentUris.withAppendedId(SensorGps.CONTENT_URI, Long.parseLong(idStr)); - getContentResolver().update(uri, updateValues, null, null); + getContentResolver().delete(uri, null, null); } } +// might need this class in the future: +// +// private void markAsSynced(String[] fixIdStrings) +// { +// for (String idStr: fixIdStrings) +// { +// ContentValues updateValues = new ContentValues(); +// updateValues.put(SensorGps.GPS_SYNCED, 1); +// Uri uri = ContentUris.withAppendedId(SensorGps.CONTENT_URI, Long.parseLong(idStr)); +// getContentResolver().update(uri, updateValues, null, null); +// } +// } + private List getUnsentFixes() { String selectionClause = SensorGps.GPS_SYNCED + " = 0"; @@ -211,7 +224,8 @@ public class TransmittingService extends Service { System.out.println("FixListener#onResponse: " + response); System.out.println("ids: " + ids); - markAsSynced(ids); + deleteSynced(ids); + //markAsSynced(ids); } }