Colota - Android GPS Location tracker
chore: clean up Kotlin imports, constants, and redundant annotations
Max Dietrich9bb4997887df
diff --git a/apps/mobile/android/app/src/main/java/com/colota/bridge/BuildConfigModule.kt b/apps/mobile/android/app/src/main/java/com/colota/bridge/BuildConfigModule.ktindex cdf0b59b..4ae642a1 100644--- a/apps/mobile/android/app/src/main/java/com/colota/bridge/BuildConfigModule.kt+++ b/apps/mobile/android/app/src/main/java/com/colota/bridge/BuildConfigModule.kt@@ -8,9 +8,6 @@import com.facebook.react.bridge.ReactApplicationContextimport com.Colota.BuildConfigimport com.facebook.react.bridge.ReactContextBaseJavaModule-import com.facebook.react.bridge.ReactMethod-import com.facebook.react.bridge.Promise-import android.os.Buildclass BuildConfigModule(reactContext: ReactApplicationContext) :ReactContextBaseJavaModule(reactContext) {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.ktindex 884931c0..340a15cc 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@@ -23,11 +23,21 @@ import com.Colota.util.DeviceInfoHelperimport com.Colota.util.FileOperationsimport com.Colota.util.AppLoggerimport com.Colota.util.SecureStorageHelper-import com.facebook.react.bridge.*+import com.facebook.react.bridge.Arguments+import com.facebook.react.bridge.LifecycleEventListener+import com.facebook.react.bridge.Promise+import com.facebook.react.bridge.ReactApplicationContext+import com.facebook.react.bridge.ReactContextBaseJavaModule+import com.facebook.react.bridge.ReactMethod+import com.facebook.react.bridge.ReadableMapimport com.facebook.react.modules.core.DeviceEventManagerModuleimport com.Colota.location.LocationProviderFactory-import org.json.JSONObject-import kotlinx.coroutines.*+import kotlinx.coroutines.CoroutineScope+import kotlinx.coroutines.Dispatchers+import kotlinx.coroutines.SupervisorJob+import kotlinx.coroutines.cancel+import kotlinx.coroutines.launch+import kotlinx.coroutines.withContextimport java.lang.ref.WeakReference/**@@ -623,8 +633,16 @@ class LocationServiceModule(reactContext: ReactApplicationContext) :if (loc == null) {promise.resolve(null)} else {- executeAsync(promise) {- geofenceHelper.getPauseZone(loc)+ moduleScope.launch {+ try {+ val zone = withContext(Dispatchers.IO) {+ geofenceHelper.getPauseZone(loc)+ }+ promise.resolve(zone)+ } catch (e: Exception) {+ AppLogger.e(TAG, "Pause zone check failed", e)+ promise.resolve(null)+ }}}},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.ktindex c4f7754b..eb5dbe6c 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@@ -8,7 +8,7 @@ package com.Colota.syncimport android.location.Locationimport com.Colota.util.AppLoggerimport org.json.JSONObject-import kotlin.math.*+import kotlin.math.roundToInt/*** Builds and parses location payloads with dynamic field mapping.diff --git a/apps/mobile/android/app/src/main/java/com/colota/sync/SyncManager.kt b/apps/mobile/android/app/src/main/java/com/colota/sync/SyncManager.ktindex c7272b57..41f6d596 100644--- a/apps/mobile/android/app/src/main/java/com/colota/sync/SyncManager.kt+++ b/apps/mobile/android/app/src/main/java/com/colota/sync/SyncManager.kt@@ -23,6 +23,7 @@ class SyncManager() {companion object {private const val TAG = "SyncManager"+ private const val MAX_BATCHES_PER_SYNC = 10}@Volatile private var endpoint: String = ""@@ -43,8 +44,6 @@ class SyncManager(private val queueCountCache = TimedCache(5000L) { dbHelper.getQueuedCount() }- private val MAX_BATCHES_PER_SYNC = 10-fun updateConfig(endpoint: String,syncIntervalSeconds: Int,diff --git a/apps/mobile/android/app/src/main/java/com/colota/util/FileOperations.kt b/apps/mobile/android/app/src/main/java/com/colota/util/FileOperations.ktindex b1a717e9..e43d5018 100644--- a/apps/mobile/android/app/src/main/java/com/colota/util/FileOperations.kt+++ b/apps/mobile/android/app/src/main/java/com/colota/util/FileOperations.kt@@ -11,11 +11,15 @@ import android.content.Contextimport android.content.Intentimport android.net.Uriimport androidx.core.content.FileProvider-import com.facebook.react.bridge.*+import com.facebook.react.bridge.ReactApplicationContextimport java.io.Fileclass FileOperations(private val context: ReactApplicationContext) {-++ companion object {+ private const val TAG = "FileOperations"+ }+/*** Writes content to a file in the app's cache directory* @param fileName Name of the file to create@@ -67,10 +71,10 @@ class FileOperations(private val context: ReactApplicationContext) {try {if (file.exists()) {file.delete()- AppLogger.d("FileOperations", "Cleaned up export file: ${file.name}")+ AppLogger.d(TAG, "Cleaned up export file: ${file.name}")}} catch (e: Exception) {- AppLogger.w("FileOperations", "Failed to cleanup file")+ AppLogger.w(TAG, "Failed to cleanup file")}}, 60000)diff --git a/apps/mobile/android/app/src/main/java/com/colota/util/SecureStorageHelper.kt b/apps/mobile/android/app/src/main/java/com/colota/util/SecureStorageHelper.ktindex 9720407c..78a3ae41 100644--- a/apps/mobile/android/app/src/main/java/com/colota/util/SecureStorageHelper.kt+++ b/apps/mobile/android/app/src/main/java/com/colota/util/SecureStorageHelper.kt@@ -8,7 +8,6 @@ package com.Colota.utilimport android.content.Contextimport android.content.SharedPreferencesimport android.util.Base64-import com.Colota.util.AppLoggerimport androidx.security.crypto.EncryptedSharedPreferencesimport androidx.security.crypto.MasterKeyimport org.json.JSONObjectdiff --git a/apps/mobile/android/app/src/main/java/com/colota/util/TimedCache.kt b/apps/mobile/android/app/src/main/java/com/colota/util/TimedCache.ktindex dfc53f11..4d6946e3 100644--- a/apps/mobile/android/app/src/main/java/com/colota/util/TimedCache.kt+++ b/apps/mobile/android/app/src/main/java/com/colota/util/TimedCache.kt@@ -6,7 +6,7 @@ package com.Colota.util/*** Generic time-based cache that reloads its value after a configurable TTL.- * Thread-safe via @Volatile annotations.+ * Thread-safe via @Synchronized access.** @param ttlMs Time-to-live in milliseconds before the cached value is refreshed* @param loader Function that produces a fresh value when the cache is stale@@ -15,8 +15,8 @@ class TimedCache<T>(private val ttlMs: Long,private val loader: () -> T) {- @Volatile private var value: T? = null- @Volatile private var lastCheck: Long = 0+ private var value: T? = null+ private var lastCheck: Long = 0@Synchronizedfun get(): T {