Merge pull request #1319 from RocketChat/fix/attachment-order

[FIX] Wrong shown pinned/favorite messages with attachment 

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

@@ -243,7 +243,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
             if (recycler_view.adapter == null) {
                 adapter = ChatRoomAdapter(
-                    chatRoomType, chatRoomName, presenter,
+                    chatRoomType,
+                    chatRoomName,
+                    presenter,
                     reactionListener = this@ChatRoomFragment
                 )
                 recycler_view.adapter = adapter

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

@@ -65,24 +65,35 @@ class ViewModelMapper @Inject constructor(
     private val currentUsername: String? = localRepository.get(LocalRepository.CURRENT_USERNAME_KEY)
     private val secondaryTextColor = ContextCompat.getColor(context, R.color.colorSecondaryText)
 
-    suspend fun map(message: Message, roomViewModel: RoomViewModel = RoomViewModel(
-        roles = emptyList(), isBroadcast = true)): List<BaseViewModel<*>> {
+    suspend fun map(
+        message: Message,
+        roomViewModel: RoomViewModel = RoomViewModel(roles = emptyList(), isBroadcast = true)
+    ): List<BaseViewModel<*>> {
         return translate(message, roomViewModel)
     }
 
-    suspend fun map(messages: List<Message>, roomViewModel: RoomViewModel = RoomViewModel(
-        roles = emptyList(), isBroadcast = true)): List<BaseViewModel<*>> = withContext(CommonPool) {
+    suspend fun map(
+        messages: List<Message>,
+        roomViewModel: RoomViewModel = RoomViewModel(roles = emptyList(), isBroadcast = true),
+        asNotReversed: Boolean = false
+    ): List<BaseViewModel<*>> =
+        withContext(CommonPool) {
             val list = ArrayList<BaseViewModel<*>>(messages.size)
 
             messages.forEach {
-            list.addAll(translate(it, roomViewModel))
+                list.addAll(
+                    if (asNotReversed) translateAsNotReversed(it, roomViewModel)
+                    else translate(it, roomViewModel)
+                )
             }
-
             return@withContext list
         }
 
-    private suspend fun translate(message: Message, roomViewModel: RoomViewModel)
-        : List<BaseViewModel<*>> = withContext(CommonPool) {
+    private suspend fun translate(
+        message: Message,
+        roomViewModel: RoomViewModel
+    ): List<BaseViewModel<*>> =
+        withContext(CommonPool) {
             val list = ArrayList<BaseViewModel<*>>()
 
             message.urls?.forEach {
@@ -118,6 +129,56 @@ class ViewModelMapper @Inject constructor(
             return@withContext list
         }
 
+    private suspend fun translateAsNotReversed(
+        message: Message,
+        roomViewModel: RoomViewModel
+    ): List<BaseViewModel<*>> =
+        withContext(CommonPool) {
+            val list = ArrayList<BaseViewModel<*>>()
+
+            mapMessage(message).let {
+                if (list.isNotEmpty()) {
+                    it.preview = list.first().preview
+                }
+                list.add(it)
+            }
+
+            message.attachments?.forEach {
+                val attachment = mapAttachment(message, it)
+                attachment?.let {
+                    list.add(attachment)
+                }
+            }
+
+            message.urls?.forEach {
+                val url = mapUrl(message, it)
+                url?.let {
+                    list.add(url)
+                }
+            }
+
+            for (i in list.size - 1 downTo 0) {
+                val next = if (i - 1 < 0) null else list[i - 1]
+                list[i].nextDownStreamMessage = next
+            }
+
+            if (isBroadcastReplyAvailable(roomViewModel, message)) {
+                roomsInteractor.getById(currentServer, message.roomId)?.let { chatRoom ->
+                    val replyViewModel = mapMessageReply(message, chatRoom)
+                    list.first().nextDownStreamMessage = replyViewModel
+                    list.add(0, replyViewModel)
+                }
+            }
+
+            list.dropLast(1).forEach {
+                it.reactions = emptyList()
+            }
+            list.last().reactions = getReactions(message)
+            list.last().nextDownStreamMessage = null
+
+            return@withContext list
+        }
+
     private fun isBroadcastReplyAvailable(roomViewModel: RoomViewModel, message: Message): Boolean {
         val senderUsername = message.sender?.username
         return roomViewModel.isRoom && roomViewModel.isBroadcast &&
@@ -127,8 +188,8 @@ class ViewModelMapper @Inject constructor(
 
     private fun mapMessageReply(message: Message, chatRoom: ChatRoom): MessageReplyViewModel {
         val name = message.sender?.name
-        val roomName = if (settings.useRealName() && name != null) name else message.sender?.username
-            ?: ""
+        val roomName =
+            if (settings.useRealName() && name != null) name else message.sender?.username ?: ""
         val permalink = messageHelper.createPermalink(message, chatRoom)
         return MessageReplyViewModel(
             messageId = message.id,

app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt

@@ -25,9 +25,9 @@ class FavoriteMessagesPresenter @Inject constructor(
     private var offset: Int = 0
 
     /**
-     * Loads all favorite messages for room. the given room id.
+     * Loads all favorite messages for the given room id.
      *
-     * @param roomId The id of the room to get its favorite messages.
+     * @param roomId The id of the room to get favorite messages from.
      */
     fun loadFavoriteMessages(roomId: String) {
         launchUI(strategy) {
@@ -35,7 +35,7 @@ class FavoriteMessagesPresenter @Inject constructor(
                 view.showLoading()
                 roomsInteractor.getById(serverUrl, roomId)?.let {
                     val favoriteMessages = client.getFavoriteMessages(roomId, it.type, offset)
-                    val messageList = mapper.map(favoriteMessages.result)
+                    val messageList = mapper.map(favoriteMessages.result, asNotReversed = true)
                     view.showFavoriteMessages(messageList)
                     offset += 1 * 30
                 }.ifNull {

app/src/main/java/chat/rocket/android/favoritemessages/ui/FavoriteMessagesFragment.kt

@@ -72,7 +72,7 @@ class FavoriteMessagesFragment : Fragment(), FavoriteMessagesView {
                     LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
                 recycler_view.layoutManager = linearLayoutManager
                 recycler_view.itemAnimator = DefaultItemAnimator()
-                if (favoriteMessages.size > 10) {
+                if (favoriteMessages.size >= 30) {
                     recycler_view.addOnScrollListener(object :
                         EndlessRecyclerViewScrollListener(linearLayoutManager) {
                         override fun onLoadMore(

app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt

@@ -26,7 +26,7 @@ class PinnedMessagesPresenter @Inject constructor(
     private var offset: Int = 0
 
     /**
-     * Load all pinned messages for the given room id.
+     * Loads all pinned messages for the given room id.
      *
      * @param roomId The id of the room to get pinned messages from.
      */
@@ -36,8 +36,7 @@ class PinnedMessagesPresenter @Inject constructor(
                 view.showLoading()
                 roomsInteractor.getById(serverUrl, roomId)?.let {
                     val pinnedMessages = client.getPinnedMessages(roomId, it.type, offset)
-                    val messageList =
-                        mapper.map(pinnedMessages.result.filterNot { it.isSystemMessage() })
+                    val messageList = mapper.map(pinnedMessages.result, asNotReversed = true)
                     view.showPinnedMessages(messageList)
                     offset += 1 * 30
                 }.ifNull {

app/src/main/java/chat/rocket/android/pinnedmessages/ui/PinnedMessagesFragment.kt

@@ -74,7 +74,7 @@ class PinnedMessagesFragment : Fragment(), PinnedMessagesView {
                     LinearLayoutManager(context, LinearLayoutManager.VERTICAL, false)
                 recycler_view_pinned.layoutManager = linearLayoutManager
                 recycler_view_pinned.itemAnimator = DefaultItemAnimator()
-                if (pinnedMessages.size > 10) {
+                if (pinnedMessages.size >= 30) {
                     recycler_view_pinned.addOnScrollListener(object :
                         EndlessRecyclerViewScrollListener(linearLayoutManager) {
                         override fun onLoadMore(