Skip to content

Colota - Android GPS Location tracker

fix: use absolute path for logcat and prevent integer overflow in deleteOlderThan

Max Dietrich40250bf02cf3
diff --git a/apps/mobile/android/app/src/main/java/com/colota/bridge/LocationServiceModule.kt b/apps/mobile/android/app/src/main/java/com/colota/bridge/LocationServiceModule.kt
index 21ebe87c..87995320 100644
--- a/apps/mobile/android/app/src/main/java/com/colota/bridge/LocationServiceModule.kt
+++ b/apps/mobile/android/app/src/main/java/com/colota/bridge/LocationServiceModule.kt
@@ -949,7 +949,7 @@ class LocationServiceModule(reactContext: ReactApplicationContext) :
@ReactMethod
fun getNativeLogs(promise: Promise) = executeAsync(promise) {
val pid = android.os.Process.myPid()
- val process = Runtime.getRuntime().exec(arrayOf("logcat", "-d", "-v", "threadtime", "--pid=$pid"))
+ val process = Runtime.getRuntime().exec(arrayOf("/system/bin/logcat", "-d", "-v", "threadtime", "--pid=$pid"))
try {
val lines = process.inputStream.bufferedReader().readLines()
process.waitFor(10, java.util.concurrent.TimeUnit.SECONDS)
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 b5ead664..93ede042 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
@@ -544,7 +544,7 @@ class DatabaseHelper private constructor(context: Context) :
}
fun deleteOlderThan(days: Int): Int {
- val cutoff = (System.currentTimeMillis() - days * 24 * 60 * 60 * 1000L) / 1000
+ val cutoff = (System.currentTimeMillis() - days.toLong() * 24 * 60 * 60 * 1000) / 1000
return writableDatabase.delete(TABLE_LOCATIONS, "timestamp < ?", arrayOf(cutoff.toString()))
}