Skip to content

Colota - Android GPS Location tracker

Fix custom fields missing from payload and settings restart behavior

Max Dietrichf6bcefc0472d
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 9c3f5382..1ff4d4b2 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
@@ -66,15 +66,25 @@ class PayloadBuilder {
}
}
- /** Expected format: [{"key":"_type","value":"location"},...] */
+ /**
+ * Parses custom fields from either format:
+ * - Array: [{"key":"_type","value":"location"},...] (from DB / SettingsService)
+ * - Object: {"_type":"location",...} (from Intent / ReadableMap)
+ */
fun parseCustomFields(jsonString: String?): Map<String, String>? {
- if (jsonString.isNullOrBlank() || jsonString == "[]") return null
+ if (jsonString.isNullOrBlank() || jsonString == "[]" || jsonString == "{}") return null
+ val trimmed = jsonString.trim()
return try {
- val arr = org.json.JSONArray(jsonString)
val map = mutableMapOf<String, String>()
- for (i in 0 until arr.length()) {
- val obj = arr.getJSONObject(i)
- map[obj.getString("key")] = obj.getString("value")
+ if (trimmed.startsWith("[")) {
+ val arr = org.json.JSONArray(trimmed)
+ for (i in 0 until arr.length()) {
+ val obj = arr.getJSONObject(i)
+ map[obj.getString("key")] = obj.getString("value")
+ }
+ } else {
+ val obj = JSONObject(trimmed)
+ obj.keys().forEach { key -> map[key] = obj.getString(key) }
}
if (map.isEmpty()) null else map
} catch (e: Exception) {
diff --git a/apps/mobile/src/hooks/useLocationTracking.ts b/apps/mobile/src/hooks/useLocationTracking.ts
index 3ba84481..62747e3e 100644
--- a/apps/mobile/src/hooks/useLocationTracking.ts
+++ b/apps/mobile/src/hooks/useLocationTracking.ts
@@ -230,6 +230,13 @@ export function useLocationTracking(settings: Settings): LocationTrackingResult
*/
const restartTracking = useCallback(
async (newSettings?: Settings) => {
+ // Only restart if tracking is active — settings are persisted separately,
+ // so they'll be picked up when the user starts tracking later.
+ if (!isTrackingRef.current) {
+ logger.debug("[useLocationTracking] Not tracking, skip restart (settings saved separately)")
+ return
+ }
+
if (restartingRef.current) {
logger.debug("[useLocationTracking] Restart already in progress, queuing")
restartQueuedRef.current = true