Merge pull request #6104 from nextcloud/bugfix/6052/fixToImmediatelyShowMessagesAfterSending

Bugfix/6052/fix to immediately show messages after sending

Author: mahibi

app/src/main/java/com/nextcloud/talk/chat/ui/model/ChatMessageUi.kt

@@ -170,18 +170,14 @@ fun resolveStatusIcon(
     lastCommonReadMessageId: Int,
     isTemporary: Boolean,
     sendStatus: SendStatus?
-): MessageStatusIcon {
-    val status = if (sendStatus == SendStatus.FAILED) {
-        MessageStatusIcon.FAILED
-    } else if (isTemporary) {
-        MessageStatusIcon.SENDING
-    } else if (jsonMessageId <= lastCommonReadMessageId) {
-        MessageStatusIcon.READ
-    } else {
-        MessageStatusIcon.SENT
+): MessageStatusIcon =
+    when {
+        sendStatus == SendStatus.FAILED -> MessageStatusIcon.FAILED
+        sendStatus == SendStatus.SENT_PENDING_ACK -> MessageStatusIcon.SENT
+        isTemporary -> MessageStatusIcon.SENDING
+        jsonMessageId <= lastCommonReadMessageId -> MessageStatusIcon.READ
+        else -> MessageStatusIcon.SENT
     }
-    return status
-}
 
 fun getMessageTypeContent(user: User, message: ChatMessage): MessageTypeContent? =
     if (message.isSystemMessage) {

app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt

@@ -29,7 +29,7 @@ interface ChatMessagesDao {
     FROM ChatMessages
     WHERE internalConversationId = :internalConversationId
       AND (:threadId IS NULL OR threadId = :threadId)
-      AND id >= :oldestMessageId
+      AND (id >= :oldestMessageId OR isTemporary = 1)
     ORDER BY timestamp ASC, id ASC
     """
     )