Skip to content

Colota - Android GPS Location tracker

refactor: move format-specific payload builders to PayloadBuilder

Max Dietrich4df1086c911f
diff --git a/apps/docs/docs/guides/backup-restore.md b/apps/docs/docs/guides/backup-restore.md
index 1b94dc93..3a2d1cef 100644
--- a/apps/docs/docs/guides/backup-restore.md
+++ b/apps/docs/docs/guides/backup-restore.md
@@ -15,7 +15,7 @@ Use this when you want a full archive of your data, when you're moving to a new
| Location history (the full SQLite database) | mTLS client certificate (private key in OS keystore - re-import the `.p12` after restore) |
| Settings (sync, GPS, server, appearance) | Offline map tiles (re-download after restore) |
| Geofences and tracking profiles | Cached map tiles |
-| Auth credentials (Basic, Bearer, custom headers) | |
+| Auth credentials (Basic, Bearer, custom headers) | |
| mTLS Trusted Server CA (public cert bytes) | |
The auth credentials Colota uses to reach your tracking endpoint (Basic Auth, Bearer token, custom headers) are stored as plaintext inside the encrypted container - they are protected by the backup password, not by the device's hardware-backed key. The leaked credentials let an attacker do whatever your server lets those credentials do. If you configured Colota with a credential limited to writing location data, that's all an attacker gets. If you used a credential tied to a user with broader privileges, or any token with more scope than posting locations requires, the attacker inherits that scope. Configure Colota with the minimum permission its endpoint actually needs. On restore the credentials are rewrapped under the destination device's key.
diff --git a/apps/mobile/android/app/src/main/java/com/colota/sync/ApiFormat.kt b/apps/mobile/android/app/src/main/java/com/colota/sync/ApiFormat.kt
index b30cb18b..291cdf66 100644
--- a/apps/mobile/android/app/src/main/java/com/colota/sync/ApiFormat.kt
+++ b/apps/mobile/android/app/src/main/java/com/colota/sync/ApiFormat.kt
@@ -8,7 +8,7 @@ package com.Colota.sync
/**
* Supported outbound payload formats. FIELD_MAPPED applies the user's fieldMap;
* TRACCAR_JSON uses fixed internal field names so the wire transform in
- * NetworkManager.buildTraccarJsonPayload can read them back unambiguously.
+ * PayloadBuilder.buildTraccarJsonPayload can read them back unambiguously.
*
* Wire names are the string values persisted in settings and on the JS bridge.
*/
diff --git a/apps/mobile/android/app/src/main/java/com/colota/sync/NetworkManager.kt b/apps/mobile/android/app/src/main/java/com/colota/sync/NetworkManager.kt
index b1566f24..549ff63a 100644
--- a/apps/mobile/android/app/src/main/java/com/colota/sync/NetworkManager.kt
+++ b/apps/mobile/android/app/src/main/java/com/colota/sync/NetworkManager.kt
@@ -6,7 +6,6 @@ import android.net.wifi.WifiManager
import com.Colota.BuildConfig
import com.Colota.util.AppLogger
import com.Colota.sync.tls.ClientCertSslContextProvider
-import com.Colota.util.BatteryStatus
import com.Colota.util.TimedCache
import android.os.Build
import android.net.ConnectivityManager
@@ -290,7 +289,7 @@ class NetworkManager(private val context: Context) {
return@withContext BatchResult.NetworkError
}
- val envelope = buildOverlandBatchPayload(items, customFields)
+ val envelope = PayloadBuilder.buildOverlandBatchPayload(items, customFields)
var connection: HttpURLConnection? = null
try {
@@ -362,8 +361,8 @@ class NetworkManager(private val context: Context) {
}
val transformedPayload = when (apiFormat) {
- ApiFormat.TRACCAR_JSON -> buildTraccarJsonPayload(payload)
- ApiFormat.OVERLAND_BATCH -> buildOverlandBatchPayload(listOf(payload), customFields)
+ ApiFormat.TRACCAR_JSON -> PayloadBuilder.buildTraccarJsonPayload(payload)
+ ApiFormat.OVERLAND_BATCH -> PayloadBuilder.buildOverlandBatchPayload(listOf(payload), customFields)
ApiFormat.FIELD_MAPPED -> payload
}
val isGet = httpMethod.equals("GET", ignoreCase = true)
@@ -460,106 +459,6 @@ class NetworkManager(private val context: Context) {
connection.errorStream?.bufferedReader()?.use { it.readText() } ?: "No error body"
} catch (_: Exception) { "Could not read error body" }
- /**
- * Custom fields go at the envelope level (matches the Overland iOS client and
- * what Dawarich's overland controller expects), NOT inside per-Feature properties.
- *
- * The `device_id` fallback chain (device_id -> tid -> id -> "colota") lets users
- * migrating from OwnTracks (tid) or Traccar (id) keep their identity working
- * without reconfiguring custom fields. Don't prune as dead code.
- */
- private fun buildOverlandBatchPayload(
- items: List<JSONObject>,
- customFields: Map<String, String>,
- ): JSONObject {
- val locations = org.json.JSONArray()
- for (flat in items) {
- locations.put(flatToOverlandFeature(flat))
- }
- return JSONObject().apply {
- put("locations", locations)
- customFields.forEach { (key, value) ->
- if (key != "device_id" && key != "locations") put(key, value)
- }
- val firstPayload = items.firstOrNull() ?: JSONObject()
- val deviceId = customFields["device_id"]?.ifBlank { null }
- ?: firstPayload.optString("device_id", "").ifBlank { null }
- ?: firstPayload.optString("tid", "").ifBlank { null }
- ?: firstPayload.optString("id", "").ifBlank { null }
- ?: "colota"
- put("device_id", deviceId)
- }
- }
-
- private fun flatToOverlandFeature(flat: JSONObject): JSONObject {
- val coordinates = org.json.JSONArray().apply {
- put(flat.optDouble("lon", 0.0)) // GeoJSON: [lon, lat], not lat/lon
- put(flat.optDouble("lat", 0.0))
- }
- val geometry = JSONObject().apply {
- put("type", "Point")
- put("coordinates", coordinates)
- }
- val properties = JSONObject().apply {
- // Guard against tst=0 from a corrupted row (optLong's default only fires on missing key).
- val tstRaw = flat.optLong("tst", 0L)
- val tst = if (tstRaw > 0) tstRaw else System.currentTimeMillis() / 1000
- put("timestamp", java.time.Instant.ofEpochSecond(tst).toString())
- if (flat.has("acc")) put("horizontal_accuracy", flat.optInt("acc"))
- if (flat.has("alt")) put("altitude", flat.optInt("alt"))
- if (flat.has("vel")) put("speed", flat.optDouble("vel"))
- if (flat.has("bear")) put("course", flat.optDouble("bear"))
- val batt = flat.optInt("batt", -1)
- if (batt >= 0) {
- put("battery_level", batt / 100.0)
- put("battery_state", BatteryStatus.toOverlandString(flat.optInt("bs", BatteryStatus.UNKNOWN)))
- }
- }
- return JSONObject().apply {
- put("type", "Feature")
- put("geometry", geometry)
- put("properties", properties)
- }
- }
-
- /**
- * Transforms a flat Colota payload to the Traccar JSON format (Traccar 6.7.0+).
- * https://www.traccar.org/osmand/
- */
- private fun buildTraccarJsonPayload(flat: JSONObject): JSONObject {
- val coords = JSONObject().apply {
- put("latitude", flat.optDouble("lat", 0.0))
- put("longitude", flat.optDouble("lon", 0.0))
- if (flat.has("acc")) put("accuracy", flat.optDouble("acc"))
- if (flat.has("alt")) put("altitude", flat.optDouble("alt"))
- if (flat.has("vel")) put("speed", flat.optDouble("vel"))
- if (flat.has("bear")) put("heading", flat.optDouble("bear"))
- }
-
- val tst = flat.optLong("tst", System.currentTimeMillis() / 1000)
- val timestamp = java.time.Instant.ofEpochSecond(tst).toString()
-
- val location = JSONObject().apply {
- put("timestamp", timestamp)
- put("coords", coords)
- val batt = flat.optInt("batt", -1)
- if (batt >= 0) {
- val bs = flat.optInt("bs", BatteryStatus.UNKNOWN)
- put("battery", JSONObject().apply {
- put("level", batt / 100.0)
- put("is_charging", BatteryStatus.isPluggedIn(bs))
- })
- }
- }
-
- return JSONObject().apply {
- put("location", location)
- // Prefer "id" (Traccar OsmAnd GET custom field) so both modes share the same identifier
- val deviceId = flat.optString("id", "").ifBlank { flat.optString("device_id", "colota") }
- put("device_id", deviceId)
- }
- }
-
/**
* Resolves template variables in the endpoint URL.
* Uses the location's timestamp, not wall clock time,
diff --git a/apps/mobile/android/app/src/main/java/com/colota/sync/PayloadBuilder.kt b/apps/mobile/android/app/src/main/java/com/colota/sync/PayloadBuilder.kt
index 61603d7b..64f35826 100644
--- a/apps/mobile/android/app/src/main/java/com/colota/sync/PayloadBuilder.kt
+++ b/apps/mobile/android/app/src/main/java/com/colota/sync/PayloadBuilder.kt
@@ -7,7 +7,9 @@ package com.Colota.sync
import android.location.Location
import com.Colota.util.AppLogger
+import com.Colota.util.BatteryStatus
import org.json.JSONObject
+import java.time.Instant
import kotlin.math.roundToInt
/** Stateless builder for outgoing location payloads. */
@@ -63,6 +65,103 @@ object PayloadBuilder {
}
}
+ /**
+ * Custom fields go at the envelope level (matches the Overland iOS client and
+ * what Dawarich's overland controller expects), NOT inside per-Feature properties.
+ *
+ * The `device_id` fallback chain (device_id -> tid -> id -> "colota") lets users
+ * migrating from OwnTracks (tid) or Traccar (id) keep their identity working
+ * without reconfiguring custom fields. Don't prune as dead code.
+ */
+ fun buildOverlandBatchPayload(
+ items: List<JSONObject>,
+ customFields: Map<String, String>,
+ ): JSONObject {
+ val locations = org.json.JSONArray()
+ for (flat in items) {
+ locations.put(flatToOverlandFeature(flat))
+ }
+ return JSONObject().apply {
+ put("locations", locations)
+ customFields.forEach { (key, value) ->
+ if (key != "device_id" && key != "locations") put(key, value)
+ }
+ val firstPayload = items.firstOrNull() ?: JSONObject()
+ val deviceId = customFields["device_id"]?.ifBlank { null }
+ ?: firstPayload.optString("device_id", "").ifBlank { null }
+ ?: firstPayload.optString("tid", "").ifBlank { null }
+ ?: firstPayload.optString("id", "").ifBlank { null }
+ ?: "colota"
+ put("device_id", deviceId)
+ }
+ }
+
+ private fun flatToOverlandFeature(flat: JSONObject): JSONObject {
+ val coordinates = org.json.JSONArray().apply {
+ put(flat.optDouble("lon", 0.0)) // GeoJSON: [lon, lat], not lat/lon
+ put(flat.optDouble("lat", 0.0))
+ }
+ val geometry = JSONObject().apply {
+ put("type", "Point")
+ put("coordinates", coordinates)
+ }
+ val properties = JSONObject().apply {
+ // Guard against tst=0 from a corrupted row (optLong's default only fires on missing key).
+ val tstRaw = flat.optLong("tst", 0L)
+ val tst = if (tstRaw > 0) tstRaw else System.currentTimeMillis() / 1000
+ put("timestamp", Instant.ofEpochSecond(tst).toString())
+ if (flat.has("acc")) put("horizontal_accuracy", flat.optInt("acc"))
+ if (flat.has("alt")) put("altitude", flat.optInt("alt"))
+ if (flat.has("vel")) put("speed", flat.optDouble("vel"))
+ if (flat.has("bear")) put("course", flat.optDouble("bear"))
+ val batt = flat.optInt("batt", -1)
+ if (batt >= 0) {
+ put("battery_level", batt / 100.0)
+ put("battery_state", BatteryStatus.toOverlandString(flat.optInt("bs", BatteryStatus.UNKNOWN)))
+ }
+ }
+ return JSONObject().apply {
+ put("type", "Feature")
+ put("geometry", geometry)
+ put("properties", properties)
+ }
+ }
+
+ /** Traccar 6.7.0+ JSON spec: https://www.traccar.org/osmand/ */
+ fun buildTraccarJsonPayload(flat: JSONObject): JSONObject {
+ val coords = JSONObject().apply {
+ put("latitude", flat.optDouble("lat", 0.0))
+ put("longitude", flat.optDouble("lon", 0.0))
+ if (flat.has("acc")) put("accuracy", flat.optDouble("acc"))
+ if (flat.has("alt")) put("altitude", flat.optDouble("alt"))
+ if (flat.has("vel")) put("speed", flat.optDouble("vel"))
+ if (flat.has("bear")) put("heading", flat.optDouble("bear"))
+ }
+
+ val tst = flat.optLong("tst", System.currentTimeMillis() / 1000)
+ val timestamp = Instant.ofEpochSecond(tst).toString()
+
+ val location = JSONObject().apply {
+ put("timestamp", timestamp)
+ put("coords", coords)
+ val batt = flat.optInt("batt", -1)
+ if (batt >= 0) {
+ val bs = flat.optInt("bs", BatteryStatus.UNKNOWN)
+ put("battery", JSONObject().apply {
+ put("level", batt / 100.0)
+ put("is_charging", BatteryStatus.isPluggedIn(bs))
+ })
+ }
+ }
+
+ return JSONObject().apply {
+ put("location", location)
+ // Prefer "id" (Traccar OsmAnd GET custom field) so both modes share the same identifier
+ val deviceId = flat.optString("id", "").ifBlank { flat.optString("device_id", "colota") }
+ put("device_id", deviceId)
+ }
+ }
+
/**
* Parses custom fields from either format:
* - Array: [{"key":"_type","value":"location"},...] (from DB / SettingsService)
diff --git a/apps/mobile/android/app/src/test/java/com/Colota/sync/NetworkManagerTest.kt b/apps/mobile/android/app/src/test/java/com/Colota/sync/NetworkManagerTest.kt
index 38b50067..69a6b427 100644
--- a/apps/mobile/android/app/src/test/java/com/Colota/sync/NetworkManagerTest.kt
+++ b/apps/mobile/android/app/src/test/java/com/Colota/sync/NetworkManagerTest.kt
@@ -3,7 +3,6 @@ package com.Colota.sync
import org.json.JSONObject
import org.junit.Assert.*
import org.junit.Test
-import java.lang.reflect.Method
import com.Colota.util.AppLogger
import io.mockk.*
import org.junit.After
@@ -253,413 +252,6 @@ class NetworkManagerTest {
assertEquals("Bear***", result)
}
- // --- buildTraccarJsonPayload ---
-
- @Test
- fun `buildTraccarJsonPayload maps lat and lon to coords`() {
- val flat = JSONObject().apply {
- put("lat", 52.12345)
- put("lon", -2.12345)
- put("tst", 1739362800L)
- }
- val result = invokeBuildTraccarJsonPayload(flat)
- val coords = result.getJSONObject("location").getJSONObject("coords")
- assertEquals(52.12345, coords.getDouble("latitude"), 0.0001)
- assertEquals(-2.12345, coords.getDouble("longitude"), 0.0001)
- }
-
- @Test
- fun `buildTraccarJsonPayload uses id field as device_id`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- put("id", "my-phone")
- }
- val result = invokeBuildTraccarJsonPayload(flat)
- assertEquals("my-phone", result.getString("device_id"))
- }
-
- @Test
- fun `buildTraccarJsonPayload falls back to device_id field when id absent`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- put("device_id", "my-device")
- }
- val result = invokeBuildTraccarJsonPayload(flat)
- assertEquals("my-device", result.getString("device_id"))
- }
-
- @Test
- fun `buildTraccarJsonPayload defaults device_id to colota`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- }
- val result = invokeBuildTraccarJsonPayload(flat)
- assertEquals("colota", result.getString("device_id"))
- }
-
- @Test
- fun `buildTraccarJsonPayload includes optional coords fields when present`() {
- val flat = JSONObject().apply {
- put("lat", 52.0); put("lon", 13.0); put("tst", 1000L)
- put("acc", 15.0)
- put("alt", 380.0)
- put("vel", 5.5)
- put("bear", 90.0)
- }
- val result = invokeBuildTraccarJsonPayload(flat)
- val coords = result.getJSONObject("location").getJSONObject("coords")
- assertEquals(15.0, coords.getDouble("accuracy"), 0.001)
- assertEquals(380.0, coords.getDouble("altitude"), 0.001)
- assertEquals(5.5, coords.getDouble("speed"), 0.001)
- assertEquals(90.0, coords.getDouble("heading"), 0.001)
- }
-
- @Test
- fun `buildTraccarJsonPayload omits optional coords fields when absent`() {
- val flat = JSONObject().apply {
- put("lat", 52.0); put("lon", 13.0); put("tst", 1000L)
- }
- val result = invokeBuildTraccarJsonPayload(flat)
- val coords = result.getJSONObject("location").getJSONObject("coords")
- assertFalse(coords.has("accuracy"))
- assertFalse(coords.has("altitude"))
- assertFalse(coords.has("speed"))
- assertFalse(coords.has("heading"))
- }
-
- @Test
- fun `buildTraccarJsonPayload includes battery when batt present`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- put("batt", 85)
- put("bs", 2) // charging
- }
- val result = invokeBuildTraccarJsonPayload(flat)
- val battery = result.getJSONObject("location").getJSONObject("battery")
- assertEquals(0.85, battery.getDouble("level"), 0.001)
- assertTrue(battery.getBoolean("is_charging"))
- }
-
- @Test
- fun `buildTraccarJsonPayload omits battery when batt absent`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- }
- val result = invokeBuildTraccarJsonPayload(flat)
- assertFalse(result.getJSONObject("location").has("battery"))
- }
-
- @Test
- fun `buildTraccarJsonPayload formats timestamp as ISO 8601`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0)
- put("tst", 1739362800L)
- }
- val result = invokeBuildTraccarJsonPayload(flat)
- val timestamp = result.getJSONObject("location").getString("timestamp")
- assertTrue("Expected ISO 8601 format, got: $timestamp", timestamp.contains("T") && timestamp.endsWith("Z"))
- }
-
- // --- buildTraccarJsonPayload: battery status codes ---
-
- @Test
- fun `buildTraccarJsonPayload marks bs=3 full as charging`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- put("batt", 100); put("bs", 3) // full
- }
- val result = invokeBuildTraccarJsonPayload(flat)
- val battery = result.getJSONObject("location").getJSONObject("battery")
- assertTrue(battery.getBoolean("is_charging"))
- assertEquals(1.0, battery.getDouble("level"), 0.001)
- }
-
- @Test
- fun `buildTraccarJsonPayload marks bs=1 not charging as not charging`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- put("batt", 50); put("bs", 1) // not charging
- }
- val result = invokeBuildTraccarJsonPayload(flat)
- val battery = result.getJSONObject("location").getJSONObject("battery")
- assertFalse(battery.getBoolean("is_charging"))
- }
-
- @Test
- fun `buildTraccarJsonPayload marks bs=0 unknown as not charging`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- put("batt", 50); put("bs", 0)
- }
- val result = invokeBuildTraccarJsonPayload(flat)
- val battery = result.getJSONObject("location").getJSONObject("battery")
- assertFalse(battery.getBoolean("is_charging"))
- }
-
- // --- buildTraccarJsonPayload: JSON roundtrip (simulates batch sync path) ---
-
- @Test
- fun `buildTraccarJsonPayload produces identical output after JSON string roundtrip`() {
- val flat = JSONObject().apply {
- put("id", "my-tracker")
- put("lat", 52.12345)
- put("lon", -2.12345)
- put("acc", 15)
- put("alt", 380)
- put("vel", 5.5)
- put("bear", 90.0)
- put("batt", 85)
- put("bs", 2)
- put("tst", 1739362800L)
- }
-
- // Direct path (instant sync)
- val directResult = invokeBuildTraccarJsonPayload(flat)
-
- // Roundtrip path (batch sync: toString -> DB -> JSONObject parse)
- val serialized = flat.toString()
- val roundtripped = JSONObject(serialized)
- val roundtripResult = invokeBuildTraccarJsonPayload(roundtripped)
-
- // All fields must match
- assertEquals(
- directResult.getString("device_id"),
- roundtripResult.getString("device_id")
- )
- val directCoords = directResult.getJSONObject("location").getJSONObject("coords")
- val roundtripCoords = roundtripResult.getJSONObject("location").getJSONObject("coords")
- assertEquals(directCoords.getDouble("latitude"), roundtripCoords.getDouble("latitude"), 0.00001)
- assertEquals(directCoords.getDouble("longitude"), roundtripCoords.getDouble("longitude"), 0.00001)
- assertEquals(directCoords.getDouble("accuracy"), roundtripCoords.getDouble("accuracy"), 0.001)
- assertEquals(directCoords.getDouble("altitude"), roundtripCoords.getDouble("altitude"), 0.001)
- assertEquals(directCoords.getDouble("speed"), roundtripCoords.getDouble("speed"), 0.001)
- assertEquals(directCoords.getDouble("heading"), roundtripCoords.getDouble("heading"), 0.001)
-
- val directBatt = directResult.getJSONObject("location").getJSONObject("battery")
- val roundtripBatt = roundtripResult.getJSONObject("location").getJSONObject("battery")
- assertEquals(directBatt.getDouble("level"), roundtripBatt.getDouble("level"), 0.001)
- assertEquals(directBatt.getBoolean("is_charging"), roundtripBatt.getBoolean("is_charging"))
-
- assertEquals(
- directResult.getJSONObject("location").getString("timestamp"),
- roundtripResult.getJSONObject("location").getString("timestamp")
- )
- }
-
- @Test
- fun `buildTraccarJsonPayload handles minimal payload after roundtrip`() {
- val flat = JSONObject().apply {
- put("lat", 0.0)
- put("lon", 0.0)
- put("tst", 1000L)
- }
-
- val roundtripped = JSONObject(flat.toString())
- val result = invokeBuildTraccarJsonPayload(roundtripped)
-
- assertEquals("colota", result.getString("device_id"))
- val coords = result.getJSONObject("location").getJSONObject("coords")
- assertEquals(0.0, coords.getDouble("latitude"), 0.001)
- assertFalse(coords.has("speed"))
- assertFalse(coords.has("heading"))
- assertFalse(result.getJSONObject("location").has("battery"))
- }
-
- // --- buildOverlandBatchPayload ---
-
- @Test
- fun `buildOverlandBatchPayload wraps single point in locations array`() {
- val flat = JSONObject().apply {
- put("lat", 51.5); put("lon", -0.04); put("acc", 12); put("alt", 519)
- put("vel", 0.0); put("bear", 180.5); put("batt", 85); put("bs", 2)
- put("tst", 1704067200L)
- }
- val result = invokeBuildOverlandBatchPayload(listOf(flat), emptyMap())
-
- assertTrue(result.has("locations"))
- val locations = result.getJSONArray("locations")
- assertEquals(1, locations.length())
- val feature = locations.getJSONObject(0)
- assertEquals("Feature", feature.getString("type"))
- }
-
- @Test
- fun `buildOverlandBatchPayload uses GeoJSON lon-lat coordinate order`() {
- val flat = JSONObject().apply {
- put("lat", 51.5); put("lon", -0.04); put("tst", 1704067200L)
- }
- val result = invokeBuildOverlandBatchPayload(listOf(flat), emptyMap())
- val coords = result.getJSONArray("locations").getJSONObject(0)
- .getJSONObject("geometry").getJSONArray("coordinates")
- assertEquals(-0.04, coords.getDouble(0), 0.001) // lon first
- assertEquals(51.5, coords.getDouble(1), 0.001) // lat second
- }
-
- @Test
- fun `buildOverlandBatchPayload bundles 50 features in one envelope`() {
- val items = (1..50).map {
- JSONObject().apply {
- put("lat", it.toDouble()); put("lon", it.toDouble()); put("tst", 1704067200L + it)
- }
- }
- val result = invokeBuildOverlandBatchPayload(items, emptyMap())
- assertEquals(50, result.getJSONArray("locations").length())
- }
-
- @Test
- fun `buildOverlandBatchPayload formats timestamp as ISO 8601`() {
- val flat = JSONObject().apply {
- put("lat", 51.5); put("lon", -0.04); put("tst", 1704067200L)
- }
- val result = invokeBuildOverlandBatchPayload(listOf(flat), emptyMap())
- val timestamp = result.getJSONArray("locations").getJSONObject(0)
- .getJSONObject("properties").getString("timestamp")
- assertTrue("Expected ISO 8601 format, got: $timestamp", timestamp.contains("T") && timestamp.endsWith("Z"))
- }
-
- @Test
- fun `buildOverlandBatchPayload scales battery_level from 0-100 to 0-1`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- put("batt", 85); put("bs", 2)
- }
- val result = invokeBuildOverlandBatchPayload(listOf(flat), emptyMap())
- val props = result.getJSONArray("locations").getJSONObject(0).getJSONObject("properties")
- assertEquals(0.85, props.getDouble("battery_level"), 0.001)
- assertEquals("charging", props.getString("battery_state"))
- }
-
- @Test
- fun `buildOverlandBatchPayload maps battery_state correctly`() {
- fun stateFor(bs: Int): String {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- put("batt", 50); put("bs", bs)
- }
- return invokeBuildOverlandBatchPayload(listOf(flat), emptyMap())
- .getJSONArray("locations").getJSONObject(0)
- .getJSONObject("properties").getString("battery_state")
- }
- // Mapping must match DeviceInfoHelper.kt: 0=default/unknown, 1=discharging or not charging
- // (unplugged), 2=charging, 3=full. Out-of-range values default to "unknown" (safer than
- // inventing a definite state).
- assertEquals("unknown", stateFor(0))
- assertEquals("unplugged", stateFor(1))
- assertEquals("charging", stateFor(2))
- assertEquals("full", stateFor(3))
- assertEquals("unknown", stateFor(99))
- }
-
- @Test
- fun `buildOverlandBatchPayload device_id falls back when explicit override is empty string`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L); put("tid", "AA")
- }
- // Empty-string override should not bypass the fallback chain.
- val result = invokeBuildOverlandBatchPayload(listOf(flat), mapOf("device_id" to ""))
- assertEquals("AA", result.getString("device_id"))
- }
-
- @Test
- fun `buildOverlandBatchPayload does not clobber locations when custom field has reserved key`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- }
- // A custom field named "locations" or "device_id" must not overwrite the envelope structure.
- val result = invokeBuildOverlandBatchPayload(
- listOf(flat),
- mapOf("locations" to "evil", "device_id" to "my-pixel", "extra" to "ok")
- )
- // locations stays a JSONArray, not a string
- val locations = result.getJSONArray("locations")
- assertEquals(1, locations.length())
- // device_id uses the explicit override (not literally "my-pixel" being clobbered)
- assertEquals("my-pixel", result.getString("device_id"))
- // Non-reserved custom fields still propagate
- assertEquals("ok", result.getString("extra"))
- }
-
- @Test
- fun `flatToOverlandFeature replaces tst=0 with current time`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 0L) // corrupted/zero timestamp
- }
- val result = invokeBuildOverlandBatchPayload(listOf(flat), emptyMap())
- val timestamp = result.getJSONArray("locations").getJSONObject(0)
- .getJSONObject("properties").getString("timestamp")
- // Must NOT be 1970-01-01 - we substitute current time when the stored timestamp is invalid
- assertFalse("timestamp should not be epoch zero, got: $timestamp", timestamp.startsWith("1970"))
- }
-
- @Test
- fun `buildOverlandBatchPayload omits optional properties when absent`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- }
- val result = invokeBuildOverlandBatchPayload(listOf(flat), emptyMap())
- val props = result.getJSONArray("locations").getJSONObject(0).getJSONObject("properties")
- assertFalse(props.has("horizontal_accuracy"))
- assertFalse(props.has("altitude"))
- assertFalse(props.has("speed"))
- assertFalse(props.has("course"))
- assertFalse(props.has("battery_level"))
- }
-
- @Test
- fun `buildOverlandBatchPayload places custom fields at envelope level not per Feature`() {
- val flat = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- }
- val result = invokeBuildOverlandBatchPayload(
- listOf(flat),
- mapOf("device_id" to "my-pixel", "extra" to "value")
- )
- // Envelope has the custom fields
- assertEquals("my-pixel", result.getString("device_id"))
- assertEquals("value", result.getString("extra"))
- // Feature properties do NOT have them
- val props = result.getJSONArray("locations").getJSONObject(0).getJSONObject("properties")
- assertFalse(props.has("device_id"))
- assertFalse(props.has("extra"))
- }
-
- @Test
- fun `buildOverlandBatchPayload device_id falls back through device_id then tid then id then literal`() {
- // Explicit envelope override wins
- val withDeviceId = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L); put("device_id", "from-payload")
- }
- var result = invokeBuildOverlandBatchPayload(listOf(withDeviceId), emptyMap())
- assertEquals("from-payload", result.getString("device_id"))
-
- // tid fallback (OwnTracks user migrating to batch)
- val withTid = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L); put("tid", "AA")
- }
- result = invokeBuildOverlandBatchPayload(listOf(withTid), emptyMap())
- assertEquals("AA", result.getString("device_id"))
-
- // id fallback (Traccar user migrating to batch)
- val withId = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L); put("id", "trax")
- }
- result = invokeBuildOverlandBatchPayload(listOf(withId), emptyMap())
- assertEquals("trax", result.getString("device_id"))
-
- // Literal default when nothing set
- val empty = JSONObject().apply {
- put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
- }
- result = invokeBuildOverlandBatchPayload(listOf(empty), emptyMap())
- assertEquals("colota", result.getString("device_id"))
- }
-
- @Test
- fun `buildOverlandBatchPayload returns empty locations array for empty input`() {
- val result = invokeBuildOverlandBatchPayload(emptyList(), emptyMap())
- assertEquals(0, result.getJSONArray("locations").length())
- }
-
// --- buildQueryString ---
@Test
@@ -732,24 +324,6 @@ class NetworkManagerTest {
return method.invoke(manager, headerName, headerValue) as String
}
- private fun invokeBuildTraccarJsonPayload(flat: JSONObject): JSONObject {
- val method = NetworkManager::class.java.getDeclaredMethod("buildTraccarJsonPayload", JSONObject::class.java)
- method.isAccessible = true
- val manager = createNetworkManagerViaReflection()
- return method.invoke(manager, flat) as JSONObject
- }
-
- private fun invokeBuildOverlandBatchPayload(items: List<JSONObject>, customFields: Map<String, String>): JSONObject {
- val method = NetworkManager::class.java.getDeclaredMethod(
- "buildOverlandBatchPayload",
- List::class.java,
- Map::class.java
- )
- method.isAccessible = true
- val manager = createNetworkManagerViaReflection()
- return method.invoke(manager, items, customFields) as JSONObject
- }
-
private fun invokeBuildQueryString(payload: JSONObject): String {
val method = NetworkManager::class.java.getDeclaredMethod("buildQueryString", JSONObject::class.java)
method.isAccessible = true
diff --git a/apps/mobile/android/app/src/test/java/com/Colota/sync/PayloadBuilderTest.kt b/apps/mobile/android/app/src/test/java/com/Colota/sync/PayloadBuilderTest.kt
index 53b31c80..be0596da 100644
--- a/apps/mobile/android/app/src/test/java/com/Colota/sync/PayloadBuilderTest.kt
+++ b/apps/mobile/android/app/src/test/java/com/Colota/sync/PayloadBuilderTest.kt
@@ -62,7 +62,7 @@ class PayloadBuilderTest {
apiFormat = ApiFormat.TRACCAR_JSON
)
- // Must use internal names so NetworkManager.buildTraccarJsonPayload can read them back.
+ // Must use internal names so PayloadBuilder.buildTraccarJsonPayload can read them back.
assertEquals(52.0, payload.getDouble("lat"), 0.001)
assertEquals(13.0, payload.getDouble("lon"), 0.001)
assertEquals(1700000000L, payload.getLong("tst"))
@@ -85,7 +85,7 @@ class PayloadBuilderTest {
apiFormat = ApiFormat.OVERLAND_BATCH
)
- // Must use canonical names so NetworkManager.buildOverlandBatchPayload can extract them.
+ // Must use canonical names so PayloadBuilder.buildOverlandBatchPayload can extract them.
assertEquals(51.5, payload.getDouble("lat"), 0.001)
assertEquals(-0.04, payload.getDouble("lon"), 0.001)
assertEquals(1704067200L, payload.getLong("tst"))
@@ -420,6 +420,407 @@ class PayloadBuilderTest {
assertEquals("ok", payload.getString("other"))
}
+ // --- buildTraccarJsonPayload ---
+
+ @Test
+ fun `buildTraccarJsonPayload maps lat and lon to coords`() {
+ val flat = JSONObject().apply {
+ put("lat", 52.12345)
+ put("lon", -2.12345)
+ put("tst", 1739362800L)
+ }
+ val result = PayloadBuilder.buildTraccarJsonPayload(flat)
+ val coords = result.getJSONObject("location").getJSONObject("coords")
+ assertEquals(52.12345, coords.getDouble("latitude"), 0.0001)
+ assertEquals(-2.12345, coords.getDouble("longitude"), 0.0001)
+ }
+
+ @Test
+ fun `buildTraccarJsonPayload uses id field as device_id`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ put("id", "my-phone")
+ }
+ val result = PayloadBuilder.buildTraccarJsonPayload(flat)
+ assertEquals("my-phone", result.getString("device_id"))
+ }
+
+ @Test
+ fun `buildTraccarJsonPayload falls back to device_id field when id absent`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ put("device_id", "my-device")
+ }
+ val result = PayloadBuilder.buildTraccarJsonPayload(flat)
+ assertEquals("my-device", result.getString("device_id"))
+ }
+
+ @Test
+ fun `buildTraccarJsonPayload defaults device_id to colota`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ }
+ val result = PayloadBuilder.buildTraccarJsonPayload(flat)
+ assertEquals("colota", result.getString("device_id"))
+ }
+
+ @Test
+ fun `buildTraccarJsonPayload includes optional coords fields when present`() {
+ val flat = JSONObject().apply {
+ put("lat", 52.0); put("lon", 13.0); put("tst", 1000L)
+ put("acc", 15.0)
+ put("alt", 380.0)
+ put("vel", 5.5)
+ put("bear", 90.0)
+ }
+ val result = PayloadBuilder.buildTraccarJsonPayload(flat)
+ val coords = result.getJSONObject("location").getJSONObject("coords")
+ assertEquals(15.0, coords.getDouble("accuracy"), 0.001)
+ assertEquals(380.0, coords.getDouble("altitude"), 0.001)
+ assertEquals(5.5, coords.getDouble("speed"), 0.001)
+ assertEquals(90.0, coords.getDouble("heading"), 0.001)
+ }
+
+ @Test
+ fun `buildTraccarJsonPayload omits optional coords fields when absent`() {
+ val flat = JSONObject().apply {
+ put("lat", 52.0); put("lon", 13.0); put("tst", 1000L)
+ }
+ val result = PayloadBuilder.buildTraccarJsonPayload(flat)
+ val coords = result.getJSONObject("location").getJSONObject("coords")
+ assertFalse(coords.has("accuracy"))
+ assertFalse(coords.has("altitude"))
+ assertFalse(coords.has("speed"))
+ assertFalse(coords.has("heading"))
+ }
+
+ @Test
+ fun `buildTraccarJsonPayload includes battery when batt present`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ put("batt", 85)
+ put("bs", 2)
+ }
+ val result = PayloadBuilder.buildTraccarJsonPayload(flat)
+ val battery = result.getJSONObject("location").getJSONObject("battery")
+ assertEquals(0.85, battery.getDouble("level"), 0.001)
+ assertTrue(battery.getBoolean("is_charging"))
+ }
+
+ @Test
+ fun `buildTraccarJsonPayload omits battery when batt absent`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ }
+ val result = PayloadBuilder.buildTraccarJsonPayload(flat)
+ assertFalse(result.getJSONObject("location").has("battery"))
+ }
+
+ @Test
+ fun `buildTraccarJsonPayload formats timestamp as ISO 8601`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0)
+ put("tst", 1739362800L)
+ }
+ val result = PayloadBuilder.buildTraccarJsonPayload(flat)
+ val timestamp = result.getJSONObject("location").getString("timestamp")
+ assertTrue("Expected ISO 8601 format, got: $timestamp", timestamp.contains("T") && timestamp.endsWith("Z"))
+ }
+
+ // --- buildTraccarJsonPayload: battery status codes ---
+
+ @Test
+ fun `buildTraccarJsonPayload marks bs=3 full as charging`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ put("batt", 100); put("bs", 3)
+ }
+ val result = PayloadBuilder.buildTraccarJsonPayload(flat)
+ val battery = result.getJSONObject("location").getJSONObject("battery")
+ assertTrue(battery.getBoolean("is_charging"))
+ assertEquals(1.0, battery.getDouble("level"), 0.001)
+ }
+
+ @Test
+ fun `buildTraccarJsonPayload marks bs=1 not charging as not charging`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ put("batt", 50); put("bs", 1)
+ }
+ val result = PayloadBuilder.buildTraccarJsonPayload(flat)
+ val battery = result.getJSONObject("location").getJSONObject("battery")
+ assertFalse(battery.getBoolean("is_charging"))
+ }
+
+ @Test
+ fun `buildTraccarJsonPayload marks bs=0 unknown as not charging`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ put("batt", 50); put("bs", 0)
+ }
+ val result = PayloadBuilder.buildTraccarJsonPayload(flat)
+ val battery = result.getJSONObject("location").getJSONObject("battery")
+ assertFalse(battery.getBoolean("is_charging"))
+ }
+
+ // --- buildTraccarJsonPayload: JSON roundtrip (simulates batch sync path) ---
+
+ @Test
+ fun `buildTraccarJsonPayload produces identical output after JSON string roundtrip`() {
+ val flat = JSONObject().apply {
+ put("id", "my-tracker")
+ put("lat", 52.12345)
+ put("lon", -2.12345)
+ put("acc", 15)
+ put("alt", 380)
+ put("vel", 5.5)
+ put("bear", 90.0)
+ put("batt", 85)
+ put("bs", 2)
+ put("tst", 1739362800L)
+ }
+
+ // Direct path (instant sync)
+ val directResult = PayloadBuilder.buildTraccarJsonPayload(flat)
+
+ // Roundtrip path (batch sync: toString -> DB -> JSONObject parse)
+ val serialized = flat.toString()
+ val roundtripped = JSONObject(serialized)
+ val roundtripResult = PayloadBuilder.buildTraccarJsonPayload(roundtripped)
+
+ assertEquals(
+ directResult.getString("device_id"),
+ roundtripResult.getString("device_id")
+ )
+ val directCoords = directResult.getJSONObject("location").getJSONObject("coords")
+ val roundtripCoords = roundtripResult.getJSONObject("location").getJSONObject("coords")
+ assertEquals(directCoords.getDouble("latitude"), roundtripCoords.getDouble("latitude"), 0.00001)
+ assertEquals(directCoords.getDouble("longitude"), roundtripCoords.getDouble("longitude"), 0.00001)
+ assertEquals(directCoords.getDouble("accuracy"), roundtripCoords.getDouble("accuracy"), 0.001)
+ assertEquals(directCoords.getDouble("altitude"), roundtripCoords.getDouble("altitude"), 0.001)
+ assertEquals(directCoords.getDouble("speed"), roundtripCoords.getDouble("speed"), 0.001)
+ assertEquals(directCoords.getDouble("heading"), roundtripCoords.getDouble("heading"), 0.001)
+
+ val directBatt = directResult.getJSONObject("location").getJSONObject("battery")
+ val roundtripBatt = roundtripResult.getJSONObject("location").getJSONObject("battery")
+ assertEquals(directBatt.getDouble("level"), roundtripBatt.getDouble("level"), 0.001)
+ assertEquals(directBatt.getBoolean("is_charging"), roundtripBatt.getBoolean("is_charging"))
+
+ assertEquals(
+ directResult.getJSONObject("location").getString("timestamp"),
+ roundtripResult.getJSONObject("location").getString("timestamp")
+ )
+ }
+
+ @Test
+ fun `buildTraccarJsonPayload handles minimal payload after roundtrip`() {
+ val flat = JSONObject().apply {
+ put("lat", 0.0)
+ put("lon", 0.0)
+ put("tst", 1000L)
+ }
+
+ val roundtripped = JSONObject(flat.toString())
+ val result = PayloadBuilder.buildTraccarJsonPayload(roundtripped)
+
+ assertEquals("colota", result.getString("device_id"))
+ val coords = result.getJSONObject("location").getJSONObject("coords")
+ assertEquals(0.0, coords.getDouble("latitude"), 0.001)
+ assertFalse(coords.has("speed"))
+ assertFalse(coords.has("heading"))
+ assertFalse(result.getJSONObject("location").has("battery"))
+ }
+
+ // --- buildOverlandBatchPayload ---
+
+ @Test
+ fun `buildOverlandBatchPayload wraps single point in locations array`() {
+ val flat = JSONObject().apply {
+ put("lat", 51.5); put("lon", -0.04); put("acc", 12); put("alt", 519)
+ put("vel", 0.0); put("bear", 180.5); put("batt", 85); put("bs", 2)
+ put("tst", 1704067200L)
+ }
+ val result = PayloadBuilder.buildOverlandBatchPayload(listOf(flat), emptyMap())
+
+ assertTrue(result.has("locations"))
+ val locations = result.getJSONArray("locations")
+ assertEquals(1, locations.length())
+ val feature = locations.getJSONObject(0)
+ assertEquals("Feature", feature.getString("type"))
+ }
+
+ @Test
+ fun `buildOverlandBatchPayload uses GeoJSON lon-lat coordinate order`() {
+ val flat = JSONObject().apply {
+ put("lat", 51.5); put("lon", -0.04); put("tst", 1704067200L)
+ }
+ val result = PayloadBuilder.buildOverlandBatchPayload(listOf(flat), emptyMap())
+ val coords = result.getJSONArray("locations").getJSONObject(0)
+ .getJSONObject("geometry").getJSONArray("coordinates")
+ assertEquals(-0.04, coords.getDouble(0), 0.001) // lon first
+ assertEquals(51.5, coords.getDouble(1), 0.001) // lat second
+ }
+
+ @Test
+ fun `buildOverlandBatchPayload bundles 50 features in one envelope`() {
+ val items = (1..50).map {
+ JSONObject().apply {
+ put("lat", it.toDouble()); put("lon", it.toDouble()); put("tst", 1704067200L + it)
+ }
+ }
+ val result = PayloadBuilder.buildOverlandBatchPayload(items, emptyMap())
+ assertEquals(50, result.getJSONArray("locations").length())
+ }
+
+ @Test
+ fun `buildOverlandBatchPayload formats timestamp as ISO 8601`() {
+ val flat = JSONObject().apply {
+ put("lat", 51.5); put("lon", -0.04); put("tst", 1704067200L)
+ }
+ val result = PayloadBuilder.buildOverlandBatchPayload(listOf(flat), emptyMap())
+ val timestamp = result.getJSONArray("locations").getJSONObject(0)
+ .getJSONObject("properties").getString("timestamp")
+ assertTrue("Expected ISO 8601 format, got: $timestamp", timestamp.contains("T") && timestamp.endsWith("Z"))
+ }
+
+ @Test
+ fun `buildOverlandBatchPayload scales battery_level from 0-100 to 0-1`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ put("batt", 85); put("bs", 2)
+ }
+ val result = PayloadBuilder.buildOverlandBatchPayload(listOf(flat), emptyMap())
+ val props = result.getJSONArray("locations").getJSONObject(0).getJSONObject("properties")
+ assertEquals(0.85, props.getDouble("battery_level"), 0.001)
+ assertEquals("charging", props.getString("battery_state"))
+ }
+
+ @Test
+ fun `buildOverlandBatchPayload maps battery_state correctly`() {
+ fun stateFor(bs: Int): String {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ put("batt", 50); put("bs", bs)
+ }
+ return PayloadBuilder.buildOverlandBatchPayload(listOf(flat), emptyMap())
+ .getJSONArray("locations").getJSONObject(0)
+ .getJSONObject("properties").getString("battery_state")
+ }
+ // Mapping must match DeviceInfoHelper.kt: 0=default/unknown, 1=discharging or not charging
+ // (unplugged), 2=charging, 3=full. Out-of-range values default to "unknown" (safer than
+ // inventing a definite state).
+ assertEquals("unknown", stateFor(0))
+ assertEquals("unplugged", stateFor(1))
+ assertEquals("charging", stateFor(2))
+ assertEquals("full", stateFor(3))
+ assertEquals("unknown", stateFor(99))
+ }
+
+ @Test
+ fun `buildOverlandBatchPayload device_id falls back when explicit override is empty string`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L); put("tid", "AA")
+ }
+ // Empty-string override should not bypass the fallback chain.
+ val result = PayloadBuilder.buildOverlandBatchPayload(listOf(flat), mapOf("device_id" to ""))
+ assertEquals("AA", result.getString("device_id"))
+ }
+
+ @Test
+ fun `buildOverlandBatchPayload does not clobber locations when custom field has reserved key`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ }
+ // A custom field named "locations" or "device_id" must not overwrite the envelope structure.
+ val result = PayloadBuilder.buildOverlandBatchPayload(
+ listOf(flat),
+ mapOf("locations" to "evil", "device_id" to "my-pixel", "extra" to "ok")
+ )
+ val locations = result.getJSONArray("locations")
+ assertEquals(1, locations.length())
+ assertEquals("my-pixel", result.getString("device_id"))
+ assertEquals("ok", result.getString("extra"))
+ }
+
+ @Test
+ fun `flatToOverlandFeature replaces tst=0 with current time`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 0L) // corrupted/zero timestamp
+ }
+ val result = PayloadBuilder.buildOverlandBatchPayload(listOf(flat), emptyMap())
+ val timestamp = result.getJSONArray("locations").getJSONObject(0)
+ .getJSONObject("properties").getString("timestamp")
+ // Must NOT be 1970-01-01 - we substitute current time when the stored timestamp is invalid
+ assertFalse("timestamp should not be epoch zero, got: $timestamp", timestamp.startsWith("1970"))
+ }
+
+ @Test
+ fun `buildOverlandBatchPayload omits optional properties when absent`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ }
+ val result = PayloadBuilder.buildOverlandBatchPayload(listOf(flat), emptyMap())
+ val props = result.getJSONArray("locations").getJSONObject(0).getJSONObject("properties")
+ assertFalse(props.has("horizontal_accuracy"))
+ assertFalse(props.has("altitude"))
+ assertFalse(props.has("speed"))
+ assertFalse(props.has("course"))
+ assertFalse(props.has("battery_level"))
+ }
+
+ @Test
+ fun `buildOverlandBatchPayload places custom fields at envelope level not per Feature`() {
+ val flat = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ }
+ val result = PayloadBuilder.buildOverlandBatchPayload(
+ listOf(flat),
+ mapOf("device_id" to "my-pixel", "extra" to "value")
+ )
+ assertEquals("my-pixel", result.getString("device_id"))
+ assertEquals("value", result.getString("extra"))
+ val props = result.getJSONArray("locations").getJSONObject(0).getJSONObject("properties")
+ assertFalse(props.has("device_id"))
+ assertFalse(props.has("extra"))
+ }
+
+ @Test
+ fun `buildOverlandBatchPayload device_id falls back through device_id then tid then id then literal`() {
+ // Explicit envelope override wins
+ val withDeviceId = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L); put("device_id", "from-payload")
+ }
+ var result = PayloadBuilder.buildOverlandBatchPayload(listOf(withDeviceId), emptyMap())
+ assertEquals("from-payload", result.getString("device_id"))
+
+ // tid fallback (OwnTracks user migrating to batch)
+ val withTid = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L); put("tid", "AA")
+ }
+ result = PayloadBuilder.buildOverlandBatchPayload(listOf(withTid), emptyMap())
+ assertEquals("AA", result.getString("device_id"))
+
+ // id fallback (Traccar user migrating to batch)
+ val withId = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L); put("id", "trax")
+ }
+ result = PayloadBuilder.buildOverlandBatchPayload(listOf(withId), emptyMap())
+ assertEquals("trax", result.getString("device_id"))
+
+ // Literal default when nothing set
+ val empty = JSONObject().apply {
+ put("lat", 1.0); put("lon", 1.0); put("tst", 1000L)
+ }
+ result = PayloadBuilder.buildOverlandBatchPayload(listOf(empty), emptyMap())
+ assertEquals("colota", result.getString("device_id"))
+ }
+
+ @Test
+ fun `buildOverlandBatchPayload returns empty locations array for empty input`() {
+ val result = PayloadBuilder.buildOverlandBatchPayload(emptyList(), emptyMap())
+ assertEquals(0, result.getJSONArray("locations").length())
+ }
+
// --- helpers ---
private fun buildPayload(