From bda5edf1056c912ae03f7a2615eaeddeebf98c15 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 18 Sep 2024 13:42:27 +0200
Subject: [PATCH] Fix time display in chat

---
 .../habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
index 104b130a4..e2b86bafa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
@@ -14,6 +14,7 @@ import com.habitrpg.android.habitica.ui.adapter.BaseRecyclerViewAdapter
 import com.habitrpg.android.habitica.ui.adapter.DiffCallback
 import com.habitrpg.android.habitica.ui.viewHolders.ChatRecyclerMessageViewHolder
 import com.habitrpg.common.habitica.helpers.LanguageHelper
+import java.text.DateFormat
 import java.text.SimpleDateFormat
 
 class ChatDiffCallback(oldList: List<BaseMainObject>, newList: List<BaseMainObject>) :
@@ -126,7 +127,7 @@ class ChatRecyclerViewAdapter(user: User?, private val isTavern: Boolean) :
 }
 
 class SystemChatMessageViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-    private val dateTime = java.text.SimpleDateFormat.getDateInstance(SimpleDateFormat.MEDIUM, LanguageHelper.systemLocale)
+    private val dateFormatter = DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM, LanguageHelper.systemLocale)
     val binding = SystemChatMessageBinding.bind(itemView)
 
     var onShouldExpand: (() -> Unit)? = null
@@ -144,7 +145,7 @@ class SystemChatMessageViewHolder(itemView: View) : RecyclerView.ViewHolder(item
         binding.textView.text = chatMessage?.text?.removePrefix("`")?.removeSuffix("`")
         binding.systemMessageTimestamp.text =
             chatMessage?.timestamp?.let { java.util.Date(it) }
-                ?.let { dateTime.format(it) }
+                ?.let { dateFormatter.format(it) }
         if (isExpanded) {
             binding.systemMessageTimestamp.visibility = View.VISIBLE
         } else {