From 3407c4586bbffee5e936d44bed784259578f9052 Mon Sep 17 00:00:00 2001 From: Andrea Bruno <21980406+Andrea-Bruno@users.noreply.github.com> Date: Sat, 26 Sep 2026 19:05:38 +0200 Subject: [PATCH] Use local time for the local backup folder name The folder-based backup named its snapshot folder in UTC, while the old file-based backup used local time. This made the folder name confusing because it did not match the time shown on the device. Use the device local time for both the folder name and the parser that reads it back, so the two stay consistent. --- .../securesms/backup/v2/local/ArchiveFileSystem.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/local/ArchiveFileSystem.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/local/ArchiveFileSystem.kt index b7829130518..fca98828af5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/local/ArchiveFileSystem.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/local/ArchiveFileSystem.kt @@ -38,7 +38,6 @@ import java.text.SimpleDateFormat import java.util.Calendar import java.util.Date import java.util.Locale -import java.util.TimeZone import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicInteger @@ -272,7 +271,7 @@ class ArchiveFileSystem private constructor(private val context: Context, root: * Attempt to create a [SnapshotFileSystem] to represent a single backup snapshot. */ fun createSnapshot(): SnapshotFileSystem? { - val timestamp = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US).apply { timeZone = TimeZone.getTimeZone("UTC") }.format(Date()) + val timestamp = SimpleDateFormat("yyyy-MM-dd-HH-mm-ss", Locale.US).format(Date()) val snapshotDirectoryName = "${BACKUP_DIRECTORY_PREFIX}-$timestamp" if (signalBackups.hasFile(snapshotDirectoryName)) { @@ -529,7 +528,7 @@ private fun String.toMilliseconds(): Long { if (parts.size == 7) { try { - val calendar = Calendar.getInstance(TimeZone.getTimeZone("UTC"), Locale.US) + val calendar = Calendar.getInstance(Locale.US) calendar[Calendar.YEAR] = parts[1].toInt() calendar[Calendar.MONTH] = parts[2].toInt() - 1 calendar[Calendar.DAY_OF_MONTH] = parts[3].toInt()