Fix reactions update messages traversal

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

@@ -62,6 +62,7 @@ abstract class BaseViewHolder<T : BaseViewModel<*>>(
                 val manager = FlexboxLayoutManager(context, FlexDirection.ROW)
                 recyclerView.layoutManager = manager
                 recyclerView.adapter = adapter
+                println("* Update reactions ${it.reactions}")
                 adapter.addReactions(it.reactions.filterNot { it.unicode.startsWith(":") })
             }
         }

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

@@ -122,19 +122,22 @@ class ChatRoomAdapter(
 
     fun updateItem(message: BaseViewModel<*>) {
         var index = dataSet.indexOfLast { it.messageId == message.messageId }
-        val indexOfFirst = dataSet.indexOfFirst { it.messageId == message.messageId }
+        val indexOfNext = dataSet.indexOfFirst { it.messageId == message.messageId }
         Timber.d("index: $index")
         if (index > -1) {
             dataSet[index] = message
+            dataSet.forEachIndexed { index, viewModel ->
+                if (viewModel.messageId == message.messageId) {
+                    if (viewModel.nextDownStreamMessage == null) {
+                        viewModel.reactions = message.reactions
+                    }
                     notifyItemChanged(index)
-            while (dataSet[index].nextDownStreamMessage != null) {
-                dataSet[index].nextDownStreamMessage!!.reactions = message.reactions
-                notifyItemChanged(--index)
+                }
             }
             // Delete message only if current is a system message update, i.e.: Message Removed
-            if (message.message.isSystemMessage() && indexOfFirst > -1 && indexOfFirst != index) {
-                dataSet.removeAt(indexOfFirst)
-                notifyItemRemoved(indexOfFirst)
+            if (message.message.isSystemMessage() && indexOfNext > -1 && indexOfNext != index) {
+                dataSet.removeAt(indexOfNext)
+                notifyItemRemoved(indexOfNext)
             }
         }
     }

app/src/main/java/chat/rocket/android/chatroom/viewmodel/ViewModelMapper.kt

@@ -70,6 +70,11 @@ class ViewModelMapper @Inject constructor(private val context: Context,
             list.add(it)
         }
 
+        for (i in list.size - 1 downTo 0) {
+            val next = if (i - 1 < 0) null else list[i - 1]
+            list[i].nextDownStreamMessage = next
+        }
+
         return@withContext list
     }