From 6bbe8a0260a01e8f7c7dbd44ec0ec76acde1edcb Mon Sep 17 00:00:00 2001
From: Moez Bhatti <moez.bhatti@gmail.com>
Date: Sun, 7 Oct 2018 17:04:10 -0400
Subject: [PATCH] #1121 - Show delivered time for messages that have been
 delivered

---
 .../moez/QKSMS/feature/compose/MessagesAdapter.kt    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt
index 3ce190bd..483ac4a3 100644
--- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt
+++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt
@@ -264,14 +264,18 @@ class MessagesAdapter @Inject constructor(
         val view = viewHolder.itemView
 
         val age = TimeUnit.MILLISECONDS.toMinutes(System.currentTimeMillis() - message.date)
-        val timestamp = dateFormatter.getTimestamp(message.date)
 
         view.status.text = when {
             message.isSending() -> context.getString(R.string.message_status_sending)
-            message.isDelivered() -> context.getString(R.string.message_status_delivered, timestamp)
+            message.isDelivered() -> context.getString(R.string.message_status_delivered, dateFormatter.getTimestamp(message.dateSent))
             message.isFailedMessage() -> context.getString(R.string.message_status_failed)
-            !message.isMe() && conversation?.recipients?.size ?: 0 > 1 -> "${contactCache[message.address]?.getDisplayName()} • $timestamp"
-            else -> timestamp
+
+            // Incoming group message
+            !message.isMe() && conversation?.recipients?.size ?: 0 > 1 -> {
+                "${contactCache[message.address]?.getDisplayName()} • ${dateFormatter.getTimestamp(message.date)}"
+            }
+
+            else -> dateFormatter.getTimestamp(message.date)
         }
 
         view.status.setVisible(when {