Merge branch 'hotfix/5.86.2' into main

CDRussell · CDRussell · commit 5a5b7daf442d · 2021-05-19T16:45:33.000+01:00
diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt
@@ -272,7 +272,7 @@ class BookmarksActivity : DuckDuckGoActivity() {
             get() = "bookmarks_ddg_${formattedTimestamp()}.html"
 
         private fun formattedTimestamp(): String = formatter.format(Date())
-        private val formatter: SimpleDateFormat = SimpleDateFormat("MMddYY", Locale.US).apply {
+        private val formatter: SimpleDateFormat = SimpleDateFormat("yyyyMMdd", Locale.US).apply {
             timeZone = TimeZone.getTimeZone("UTC")
         }
     }
diff --git a/app/version/version.properties b/app/version/version.properties
@@ -1 +1 @@
-VERSION=5.86.1
+VERSION=5.86.2

Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ class BookmarksActivity : DuckDuckGoActivity() {`
`272`	`272`	`get() = "bookmarks_ddg_${formattedTimestamp()}.html"`
`273`	`273`
`274`	`274`	`private fun formattedTimestamp(): String = formatter.format(Date())`
`275`		`- private val formatter: SimpleDateFormat = SimpleDateFormat("MMddYY", Locale.US).apply {`
	`275`	`+ private val formatter: SimpleDateFormat = SimpleDateFormat("yyyyMMdd", Locale.US).apply {`
`276`	`276`	`timeZone = TimeZone.getTimeZone("UTC")`
`277`	`277`	`}`
`278`	`278`	`}`