Skip to content

Colota - Android GPS Location tracker

feat(backup): add date and time to the backup filename (#645)

Max Dietrich31629b4f736b
diff --git a/apps/mobile/android/app/src/main/java/com/colota/bridge/BackupServiceModule.kt b/apps/mobile/android/app/src/main/java/com/colota/bridge/BackupServiceModule.kt
index a80a161a..114278b4 100644
--- a/apps/mobile/android/app/src/main/java/com/colota/bridge/BackupServiceModule.kt
+++ b/apps/mobile/android/app/src/main/java/com/colota/bridge/BackupServiceModule.kt
@@ -43,7 +43,10 @@ import kotlinx.coroutines.launch
import kotlinx.coroutines.sync.Mutex
import kotlinx.coroutines.withContext
import java.io.File
+import java.text.SimpleDateFormat
import java.util.Arrays
+import java.util.Date
+import java.util.Locale
class BackupServiceModule(reactContext: ReactApplicationContext) :
ReactContextBaseJavaModule(reactContext) {
@@ -66,8 +69,10 @@ class BackupServiceModule(reactContext: ReactApplicationContext) :
private const val REQUEST_PICK_DESTINATION = 9101
private const val REQUEST_PICK_SOURCE = 9102
- private const val DEFAULT_BACKUP_FILENAME = "colota_backup.colota"
private const val MIME_BACKUP = "application/octet-stream"
+
+ internal fun defaultBackupFilename(now: Date = Date()): String =
+ "colota_backup_" + SimpleDateFormat("yyyyMMdd_HHmmss", Locale.US).format(now) + ".colota"
}
private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
@@ -86,7 +91,7 @@ class BackupServiceModule(reactContext: ReactApplicationContext) :
fun pickBackupDestination(promise: Promise) {
pickerCoordinator.pickCreateDocument(
mime = MIME_BACKUP,
- defaultName = DEFAULT_BACKUP_FILENAME,
+ defaultName = defaultBackupFilename(),
requestCode = REQUEST_PICK_DESTINATION,
promise = promise,
)
diff --git a/apps/mobile/android/app/src/test/java/com/Colota/bridge/BackupServiceModuleTest.kt b/apps/mobile/android/app/src/test/java/com/Colota/bridge/BackupServiceModuleTest.kt
index 51dd7fce..c69d1b69 100644
--- a/apps/mobile/android/app/src/test/java/com/Colota/bridge/BackupServiceModuleTest.kt
+++ b/apps/mobile/android/app/src/test/java/com/Colota/bridge/BackupServiceModuleTest.kt
@@ -43,6 +43,7 @@ import org.robolectric.Shadows.shadowOf
import org.robolectric.shadows.ShadowStatFs
import java.io.ByteArrayInputStream
import java.io.ByteArrayOutputStream
+import java.util.Date
import java.util.concurrent.CountDownLatch
import java.util.concurrent.TimeUnit
@@ -264,6 +265,14 @@ class BackupServiceModuleTest {
assertEquals("E_BACKUP_WRONG_PASSWORD", next.rejectCode)
}
+ @Test
+ fun `the suggested backup filename carries a second-precision stamp so cloud uploads never collide`() {
+ val name = BackupServiceModule.defaultBackupFilename(Date(1754130640000L))
+ assertTrue(name, name.matches(Regex("""colota_backup_\d{8}_\d{6}\.colota""")))
+ val oneSecondLater = BackupServiceModule.defaultBackupFilename(Date(1754130641000L))
+ assertNotEquals(name, oneSecondLater)
+ }
+
// promise.resolve fires before the finally re-arms, so the re-arm needs its own latch
private fun restore(backup: ByteArray, pw: CharArray): Outcome {
val outcome = Outcome()
diff --git a/fastlane/metadata/android/en-US/changelogs/48.txt b/fastlane/metadata/android/en-US/changelogs/48.txt
index dc385c9b..c280192c 100644
--- a/fastlane/metadata/android/en-US/changelogs/48.txt
+++ b/fastlane/metadata/android/en-US/changelogs/48.txt
@@ -9,4 +9,5 @@
- A local server that moves off your network is no longer trusted for unencrypted uploads
- The location privacy indicator no longer lights up when GPS is not running
- Subscribe to new releases with the RSS feed at colota.app/releases.xml
+- Backup files get a date and time in their name
- Downloaded offline map areas no longer lose their saved extents when the stored list cannot be read