Merge pull request #2337 from Shailesh351/sb_fix_rendering_bug

[FIX] Messages rendering out of order bug

Author: philipbrito

app/src/main/java/chat/rocket/android/chatroom/adapter/ChatRoomAdapter.kt

@@ -173,7 +173,8 @@ class ChatRoomAdapter(
         notifyDataSetChanged()
     }
 
-    fun updateItem(message: BaseUiModel<*>): Boolean {
+    // FIXME What's 0,1 and 2 means for here?
+    fun updateItem(message: BaseUiModel<*>): Int {
         val index = dataSet.indexOfLast { it.messageId == message.messageId }
         val indexOfNext = dataSet.indexOfFirst { it.messageId == message.messageId }
         Timber.d("index: $index")
@@ -184,17 +185,23 @@ class ChatRoomAdapter(
                     if (viewModel.nextDownStreamMessage == null) {
                         viewModel.reactions = message.reactions
                     }
-                    notifyItemChanged(ind)
+
+                    if (ind > 0 &&
+                        dataSet[ind].message.timestamp > dataSet[ind - 1].message.timestamp) {
+                        return 2
+                    } else {
+                        notifyItemChanged(ind)
+                    }
                 }
             }
             // Delete message only if current is a system message update, i.e.: Message Removed
             if (message.message.isSystemMessage() && indexOfNext > -1 && indexOfNext != index) {
                 dataSet.removeAt(indexOfNext)
                 notifyItemRemoved(indexOfNext)
             }
-            return true
+            return 0
         }
-        return false
+        return 1
     }
 
     fun removeItem(messageId: String) {

app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt

@@ -359,11 +359,13 @@ class ChatRoomPresenter @Inject constructor(
                     val id = UUID.randomUUID().toString()
                     val username = userHelper.username()
                     val user = userHelper.user()
+                    val timestamp = maxOf(getTimeStampOfLastMessageInRoom() + 1,
+                        Instant.now().toEpochMilli())
                     val newMessage = Message(
                         id = id,
                         roomId = chatRoomId,
                         message = text,
-                        timestamp = Instant.now().toEpochMilli(),
+                        timestamp = timestamp,
                         sender = SimpleUser(user?.id, user?.username ?: username, user?.name),
                         attachments = null,
                         avatar = currentServer.avatarUrl(
@@ -1389,4 +1391,12 @@ class ChatRoomPresenter @Inject constructor(
     fun getDraftUnfinishedMessage(): String? {
         return localRepository.get(draftKey)
     }
+
+    private suspend fun getTimeStampOfLastMessageInRoom(): Long {
+        return withContext(Dispatchers.IO + strategy.jobs) {
+            chatRoomId?.let {
+                dbManager.messageDao().getRecentMessagesByRoomId(it, 1).first().message.message.timestamp
+            }
+        } ?: 0
+    }
 }

app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt

@@ -553,12 +553,22 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             // TODO - investigate WHY we get a empty list here
             if (message.isEmpty()) return@ui
 
-            if (chatRoomAdapter.updateItem(message.last())) {
-                if (message.size > 1) {
-                    chatRoomAdapter.prependData(listOf(message.first()))
+            when (chatRoomAdapter.updateItem(message.last())) {
+                // FIXME: What's 0,1 and 2 means for here?
+                0 -> {
+                    if (message.size > 1) {
+                        chatRoomAdapter.prependData(listOf(message.first()))
+                    }
+                }
+                1 -> showNewMessage(message, true)
+                2 -> {
+                    // Position of new sent message is wrong because of device local time is behind server time
+                    with(chatRoomAdapter) {
+                        removeItem(message.last().messageId)
+                        prependData(listOf(message.last()))
+                        notifyDataSetChanged()
+                    }
                 }
-            } else {
-                showNewMessage(message, true)
             }
             dismissEmojiKeyboard()
         }