Skip to content
Snippets Groups Projects
Commit 9dfb59c8 authored by Matthew Finkel's avatar Matthew Finkel
Browse files

Merge remote-tracking branch 'gkgl/bug_40067' into tor-browser-81.1.1-10.0-1

parents ee0aa802 f18271e0
Branches
Tags
1 merge request!35Bug 40067: Fix reproducibility issue in classes2.dex
......@@ -38,7 +38,14 @@ object Config {
@JvmStatic
fun generateBuildDate(): String {
val dateTime = LocalDateTime.now()
val dateTime = if (System.getenv("MOZ_BUILD_DATE") != null) {
// Converting our MOZ_BUILD_DATE to LocalDateTime
val format = SimpleDateFormat("YYYYMMDDHHMMSS", Locale.US)
val date = format.parse(System.getenv("MOZ_BUILD_DATE"))
java.sql.Timestamp(date.getTime()).toLocalDateTime()
} else {
LocalDateTime.now()
}
val timeFormatter = DateTimeFormatter.ofPattern("h:mm a")
return "${dateTime.dayOfWeek.toString().toLowerCase().capitalize()} ${dateTime.monthValue}/${dateTime.dayOfMonth} @ ${timeFormatter.format(dateTime)}"
......
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment