Skip to content

Colota - Android GPS Location tracker

refactor: dedupe XML parser helpers and drop dead ExportConverters API (#392)

Max Dietricheb8bacbb4c91
diff --git a/apps/mobile/android/app/src/main/java/com/colota/importer/GpxParser.kt b/apps/mobile/android/app/src/main/java/com/colota/importer/GpxParser.kt
index 8e699c31..b0f70f3c 100644
--- a/apps/mobile/android/app/src/main/java/com/colota/importer/GpxParser.kt
+++ b/apps/mobile/android/app/src/main/java/com/colota/importer/GpxParser.kt
@@ -57,8 +57,8 @@ object GpxParser {
while (!(event == XmlPullParser.END_TAG && parser.name == pointName)) {
if (event == XmlPullParser.START_TAG) {
when (parser.name) {
- "ele" -> altitude = readTextOrNull(parser)?.toDoubleOrNull()?.toInt()
- "time" -> ts = readTextOrNull(parser)?.let { parseIso8601Seconds(it) }
+ "ele" -> altitude = parser.readTextOrNull()?.toDoubleOrNull()?.toInt()
+ "time" -> ts = parser.readTextOrNull()?.let { parseIso8601Seconds(it) }
"extensions" -> readExtensions(parser) { extName, value ->
when (extName.lowercase()) {
"accuracy" -> accuracy = value.toDoubleOrNull()?.toInt()
@@ -67,7 +67,7 @@ object GpxParser {
"battery" -> battery = value.toDoubleOrNull()?.toInt()
}
}
- else -> skipElement(parser)
+ else -> parser.skipElement()
}
}
event = parser.next()
@@ -94,7 +94,7 @@ object GpxParser {
while (!(event == XmlPullParser.END_TAG && parser.name == "extensions")) {
if (event == XmlPullParser.START_TAG) {
val name = parser.name
- val text = readTextOrNull(parser)
+ val text = parser.readTextOrNull()
if (text != null) {
onValue(name, text)
} else {
@@ -114,30 +114,10 @@ object GpxParser {
while (!(event == XmlPullParser.END_TAG && parser.name == containerName)) {
if (event == XmlPullParser.START_TAG) {
val leafName = parser.name
- val text = readTextOrNull(parser)
- if (text != null) onValue(leafName, text) else skipElement(parser)
+ val text = parser.readTextOrNull()
+ if (text != null) onValue(leafName, text) else parser.skipElement()
}
event = parser.next()
}
}
-
- private fun readTextOrNull(parser: XmlPullParser): String? {
- val event = parser.next()
- if (event != XmlPullParser.TEXT) return null
- val text = parser.text?.trim()?.takeIf { it.isNotEmpty() }
- parser.next()
- return text
- }
-
- private fun skipElement(parser: XmlPullParser) {
- if (parser.eventType != XmlPullParser.START_TAG) return
- var depth = 1
- while (depth > 0) {
- when (parser.next()) {
- XmlPullParser.END_TAG -> depth--
- XmlPullParser.START_TAG -> depth++
- XmlPullParser.END_DOCUMENT -> return
- }
- }
- }
}
diff --git a/apps/mobile/android/app/src/main/java/com/colota/importer/KmlParser.kt b/apps/mobile/android/app/src/main/java/com/colota/importer/KmlParser.kt
index a3802703..7d51a305 100644
--- a/apps/mobile/android/app/src/main/java/com/colota/importer/KmlParser.kt
+++ b/apps/mobile/android/app/src/main/java/com/colota/importer/KmlParser.kt
@@ -64,7 +64,7 @@ object KmlParser {
}
"TimeStamp" -> ts = readTimeStampWhen(parser)
"TimeSpan" -> ts = ts ?: readTimeSpanBegin(parser)
- else -> skipElement(parser)
+ else -> parser.skipElement()
}
}
event = parser.next()
@@ -109,12 +109,12 @@ object KmlParser {
while (!(event == XmlPullParser.END_TAG && parser.name == containerName)) {
if (event == XmlPullParser.START_TAG) {
if (parser.name == "coordinates") {
- val text = readTextOrNull(parser)
+ val text = parser.readTextOrNull()
if (text != null) {
result.addAll(parseCoordinatesText(text))
}
} else {
- skipElement(parser)
+ parser.skipElement()
}
}
event = parser.next()
@@ -139,10 +139,10 @@ object KmlParser {
while (!(event == XmlPullParser.END_TAG && parser.name == "TimeStamp")) {
if (event == XmlPullParser.START_TAG) {
if (parser.name == "when") {
- val text = readTextOrNull(parser)
+ val text = parser.readTextOrNull()
if (text != null) ts = parseIso8601Seconds(text)
} else {
- skipElement(parser)
+ parser.skipElement()
}
}
event = parser.next()
@@ -156,34 +156,14 @@ object KmlParser {
while (!(event == XmlPullParser.END_TAG && parser.name == "TimeSpan")) {
if (event == XmlPullParser.START_TAG) {
if (parser.name == "begin" && ts == null) {
- val text = readTextOrNull(parser)
+ val text = parser.readTextOrNull()
if (text != null) ts = parseIso8601Seconds(text)
} else {
- skipElement(parser)
+ parser.skipElement()
}
}
event = parser.next()
}
return ts
}
-
- private fun readTextOrNull(parser: XmlPullParser): String? {
- val event = parser.next()
- if (event != XmlPullParser.TEXT) return null
- val text = parser.text?.trim()?.takeIf { it.isNotEmpty() }
- parser.next()
- return text
- }
-
- private fun skipElement(parser: XmlPullParser) {
- if (parser.eventType != XmlPullParser.START_TAG) return
- var depth = 1
- while (depth > 0) {
- when (parser.next()) {
- XmlPullParser.END_TAG -> depth--
- XmlPullParser.START_TAG -> depth++
- XmlPullParser.END_DOCUMENT -> return
- }
- }
- }
}
diff --git a/apps/mobile/android/app/src/main/java/com/colota/importer/XmlReadHelpers.kt b/apps/mobile/android/app/src/main/java/com/colota/importer/XmlReadHelpers.kt
new file mode 100644
index 00000000..c06d433d
--- /dev/null
+++ b/apps/mobile/android/app/src/main/java/com/colota/importer/XmlReadHelpers.kt
@@ -0,0 +1,28 @@
+/**
+ * Copyright (C) 2026 Max Dietrich
+ * Licensed under the GNU AGPLv3. See LICENSE in the project root for details.
+ */
+
+package com.Colota.importer
+
+import org.xmlpull.v1.XmlPullParser
+
+internal fun XmlPullParser.readTextOrNull(): String? {
+ val event = next()
+ if (event != XmlPullParser.TEXT) return null
+ val value = text?.trim()?.takeIf { it.isNotEmpty() }
+ next()
+ return value
+}
+
+internal fun XmlPullParser.skipElement() {
+ if (eventType != XmlPullParser.START_TAG) return
+ var depth = 1
+ while (depth > 0) {
+ when (next()) {
+ XmlPullParser.END_TAG -> depth--
+ XmlPullParser.START_TAG -> depth++
+ XmlPullParser.END_DOCUMENT -> return
+ }
+ }
+}