From e8dcdc71827ad2c579d9adbd7f2152564dbbc677 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Thu, 29 Oct 2020 14:46:42 +0100
Subject: [PATCH] Format date in the exported trail

---
 .../settings/devtools/KeyRequestViewModel.kt      | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt
index e64f673309..4385cb2c09 100644
--- a/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/settings/devtools/KeyRequestViewModel.kt
@@ -33,6 +33,7 @@ import im.vector.app.core.extensions.exhaustive
 import im.vector.app.core.platform.VectorViewEvents
 import im.vector.app.core.platform.VectorViewModel
 import im.vector.app.core.platform.VectorViewModelAction
+import im.vector.app.core.resources.DateProvider
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import me.gujun.android.span.span
@@ -45,6 +46,7 @@ import org.matrix.android.sdk.internal.crypto.model.rest.ForwardedRoomKeyContent
 import org.matrix.android.sdk.internal.crypto.model.rest.GossipingToDeviceObject
 import org.matrix.android.sdk.internal.crypto.model.rest.RoomKeyShareRequest
 import org.matrix.android.sdk.internal.crypto.model.rest.SecretShareRequest
+import org.threeten.bp.format.DateTimeFormatter
 
 sealed class KeyRequestAction : VectorViewModelAction {
     data class ExportAudit(val uri: Uri) : KeyRequestAction()
@@ -68,6 +70,10 @@ class KeyRequestViewModel @AssistedInject constructor(
         fun create(initialState: KeyRequestViewState): KeyRequestViewModel
     }
 
+    private val full24DateFormatter by lazy {
+        DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS")
+    }
+
     companion object : MvRxViewModelFactory<KeyRequestViewModel, KeyRequestViewState> {
 
         @JvmStatic
@@ -95,7 +101,7 @@ class KeyRequestViewModel @AssistedInject constructor(
                 val raw = buildString {
                     eventList.forEach {
                         val clearType = it.getClearType()
-                        append("[${it.ageLocalTs}] : $clearType from:${it.senderId} - ")
+                        append("[${getFormattedDate(it.ageLocalTs)}] $clearType from:${it.senderId} - ")
                         when (clearType) {
                             EventType.ROOM_KEY_REQUEST   -> {
                                 val content = it.getClearContent().toModel<RoomKeyShareRequest>()
@@ -151,4 +157,11 @@ class KeyRequestViewModel @AssistedInject constructor(
             }
         }
     }
+
+    private fun getFormattedDate(ageLocalTs: Long?): String {
+        return ageLocalTs
+                ?.let { DateProvider.toLocalDateTime(it) }
+                ?.let { full24DateFormatter.format(it) }
+                ?: "?"
+    }
 }