Sort saved local messages according to their timestamps

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

@@ -73,21 +73,14 @@ class ChatRoomPresenter @Inject constructor(private val view: ChatRoomView,
         launchUI(strategy) {
             view.showLoading()
             try {
-                val oldMessages = messagesRepository.getByRoomId(chatRoomId).sortedWith(compareBy(Message::timestamp)).reversed()
+                val oldMessages = messagesRepository.getByRoomId(chatRoomId)
                 view.showMessages(mapper.map(oldMessages))
                 val messages =
                     retryIO(description = "messages chatRoom: $chatRoomId, type: $chatRoomType, offset: $offset") {
                         client.messages(chatRoomId, roomTypeOf(chatRoomType), offset, 30).result
                     }
                 messagesRepository.saveAll(messages)
-
-                val unsentMessages = messagesRepository.getUnsentByRoomId(chatRoomId)
-                var mergedMessages = messages.toMutableList()
-                mergedMessages.addAll(unsentMessages)
-                val allMessages = mergedMessages.toList().filterNot { message ->
-                    unsentMessages.find { it.id == message.id  } != null
-                }
-                val messagesViewModels = mapper.map(allMessages)
+                val messagesViewModels = mapper.map(messages)
                 view.showMessages(messagesViewModels)
 
                 // TODO: For now we are marking the room as read if we can get the messages (I mean, no exception occurs)

app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesMessagesRepository.kt

@@ -29,7 +29,7 @@ class SharedPreferencesMessagesRepository(
         val values = prefs.all.values as Collection<String>
         return@withContext values.mapNotNull { adapter.fromJson(it) }.filter {
             it.roomId == rid
-        }.toList()
+        }.toList().sortedWith(compareBy(Message::timestamp)).reversed()
     }
 
     override suspend fun getRecentMessages(rid: String, count: Long): List<Message> {