Matthew Finkel pushed to branch tor-browser-81.1.1-10.0-1 at The Tor Project / Applications / fenix

Commits:

• f18271e0
  by Georg Koppen at 2020-10-01T17:46:09+00:00

  Bug 40067: Fix reproducibility issue in classes2.dex
  
  We make sure our MOZ_BUILD_DATE gets used as a source for showing date
  related information on the Fenix about page.
  

• 9dfb59c8
  by Matthew Finkel at 2020-10-01T18:07:25+00:00

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

1 changed file:

• buildSrc/src/main/java/Config.kt

Changes:

     @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)}"