Skip to content

Colota - Android GPS Location tracker

fix: add id tiebreaker to location queries for deterministic ordering

Max Dietrich13f04a32b4bf
diff --git a/apps/mobile/android/app/src/main/java/com/colota/data/DatabaseHelper.kt b/apps/mobile/android/app/src/main/java/com/colota/data/DatabaseHelper.kt
index 03477639..d2e5eee9 100644
--- a/apps/mobile/android/app/src/main/java/com/colota/data/DatabaseHelper.kt
+++ b/apps/mobile/android/app/src/main/java/com/colota/data/DatabaseHelper.kt
@@ -352,7 +352,7 @@ class DatabaseHelper private constructor(context: Context) :
"timestamp >= ? AND timestamp <= ?",
arrayOf(startTimestamp.toString(), endTimestamp.toString()),
null, null,
- "timestamp ASC"
+ "timestamp ASC, id ASC"
).use { cursor ->
val columnNames = cursor.columnNames
@@ -632,7 +632,7 @@ class DatabaseHelper private constructor(context: Context) :
latitude, longitude, timestamp
FROM $TABLE_LOCATIONS
WHERE timestamp >= ? AND timestamp <= ?
- ORDER BY day ASC, timestamp ASC
+ ORDER BY day ASC, timestamp ASC, id ASC
""".trimIndent(),
arrayOf(startTimestamp.toString(), endTimestamp.toString())
).use { cursor ->