Skip to content

Use local time for the local backup folder name #15039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Andrea-Bruno wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use local time for the local backup folder name #15039

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/src/main/java/org/thoughtcrime/securesms/backup/v2/local/ArchiveFileSystem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)) {
Expand Down Expand Up @@ -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()
Expand Down