Fix last message of rooms in the room list.

CHANGES.md

@@ -17,6 +17,7 @@ Bugfix 🐛:
  - Tapping drawer having more than 1 room in notifications gives "malformed link" error (#2605)
  - Sent image not displayed when opened immediately after sending (#409)
  - Initial sync is not retried correctly when there is some network error. (#2632)
+ - Order of sent messages are not always respected (#729)
 
 Translations 🗣:
  -

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/verification/VerificationTransportRoomMessage.kt

@@ -368,7 +368,7 @@ internal class VerificationTransportRoomMessage(
     private fun createEventAndLocalEcho(localId: String = LocalEcho.createLocalEchoId(), type: String, roomId: String, content: Content): Event {
         return Event(
                 roomId = roomId,
-                originServerTs = System.currentTimeMillis(),
+                originServerTs = localEchoEventFactory.dummyOriginServerTs(roomId),
                 senderId = userId,
                 eventId = localId,
                 type = type,

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/query/TimelineEventEntityQueries.kt

@@ -60,14 +60,18 @@ internal fun TimelineEventEntity.Companion.latestEvent(realm: Realm,
     val roomEntity = RoomEntity.where(realm, roomId).findFirst() ?: return null
     val sendingTimelineEvents = roomEntity.sendingTimelineEvents.where().filterEvents(filters)
     val liveEvents = ChunkEntity.findLastForwardChunkOfRoom(realm, roomId)?.timelineEvents?.where()?.filterEvents(filters)
-    val query = if (includesSending && sendingTimelineEvents.findAll().isNotEmpty()) {
-        sendingTimelineEvents
+
+    val latestLiveEvent = liveEvents?.sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING)?.findFirst()
+
+    return if (includesSending) {
+        sendingTimelineEvents.findAll().toMutableList().maxByOrNull { it.root?.originServerTs ?: 0 }?.let {
+            maxOf(latestLiveEvent, it, {a, b -> ((a?.root?.originServerTs ?: 0) - (b?.root?.originServerTs ?: 0)).toInt() })
+        } ?: run {
+            latestLiveEvent
+        }
     } else {
-        liveEvents
+        latestLiveEvent
     }
-    return query
-            ?.sort(TimelineEventEntityFields.DISPLAY_INDEX, Sort.DESCENDING)
-            ?.findFirst()
 }
 
 internal fun RealmQuery<TimelineEventEntity>.filterEvents(filters: TimelineEventFilters): RealmQuery<TimelineEventEntity> {

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/call/model/MxCallImpl.kt

@@ -138,7 +138,7 @@ internal class MxCallImpl(
     private fun createEventAndLocalEcho(localId: String = LocalEcho.createLocalEchoId(), type: String, roomId: String, content: Content): Event {
         return Event(
                 roomId = roomId,
-                originServerTs = System.currentTimeMillis(),
+                originServerTs = localEchoEventFactory.dummyOriginServerTs(roomId),
                 senderId = userId,
                 eventId = localId,
                 type = type,

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/send/LocalEchoEventFactory.kt

@@ -55,10 +55,12 @@ import org.matrix.android.sdk.api.session.room.model.relation.ReplyToContent
 import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
 import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
 import org.matrix.android.sdk.api.session.room.timeline.isReply
+import org.matrix.android.sdk.internal.database.RealmSessionProvider
 import org.matrix.android.sdk.internal.di.UserId
 import org.matrix.android.sdk.internal.session.content.ThumbnailExtractor
 import org.matrix.android.sdk.internal.session.permalinks.PermalinkFactory
 import org.matrix.android.sdk.internal.session.room.send.pills.TextPillsUtils
+import org.matrix.android.sdk.internal.session.room.summary.RoomSummaryEventsHelper
 import org.matrix.android.sdk.internal.util.StringProvider
 import javax.inject.Inject
 
@@ -78,7 +80,8 @@ internal class LocalEchoEventFactory @Inject constructor(
         private val markdownParser: MarkdownParser,
         private val textPillsUtils: TextPillsUtils,
         private val localEchoRepository: LocalEchoRepository,
-        private val permalinkFactory: PermalinkFactory
+        private val permalinkFactory: PermalinkFactory,
+        private val realmSessionProvider: RealmSessionProvider
 ) {
     fun createTextEvent(roomId: String, msgType: String, text: CharSequence, autoMarkdown: Boolean): Event {
         if (msgType == MessageType.MSGTYPE_TEXT || msgType == MessageType.MSGTYPE_EMOTE) {
@@ -203,7 +206,7 @@ internal class LocalEchoEventFactory @Inject constructor(
             ContentAttachmentData.Type.IMAGE -> createImageEvent(roomId, attachment)
             ContentAttachmentData.Type.VIDEO -> createVideoEvent(roomId, attachment)
             ContentAttachmentData.Type.AUDIO -> createAudioEvent(roomId, attachment)
-            ContentAttachmentData.Type.FILE  -> createFileEvent(roomId, attachment)
+            ContentAttachmentData.Type.FILE -> createFileEvent(roomId, attachment)
         }
     }
 
@@ -218,7 +221,7 @@ internal class LocalEchoEventFactory @Inject constructor(
         val localId = LocalEcho.createLocalEchoId()
         return Event(
                 roomId = roomId,
-                originServerTs = dummyOriginServerTs(),
+                originServerTs = dummyOriginServerTs(roomId),
                 senderId = userId,
                 eventId = localId,
                 type = EventType.REACTION,
@@ -325,7 +328,7 @@ internal class LocalEchoEventFactory @Inject constructor(
         val localId = LocalEcho.createLocalEchoId()
         return Event(
                 roomId = roomId,
-                originServerTs = dummyOriginServerTs(),
+                originServerTs = dummyOriginServerTs(roomId),
                 senderId = userId,
                 eventId = localId,
                 type = type,
@@ -338,7 +341,7 @@ internal class LocalEchoEventFactory @Inject constructor(
         val localId = LocalEcho.createLocalEchoId()
         return Event(
                 roomId = roomId,
-                originServerTs = dummyOriginServerTs(),
+                originServerTs = dummyOriginServerTs(roomId),
                 senderId = userId,
                 eventId = localId,
                 type = EventType.MESSAGE,
@@ -353,8 +356,10 @@ internal class LocalEchoEventFactory @Inject constructor(
         )
     }
 
-    private fun dummyOriginServerTs(): Long {
-        return System.currentTimeMillis()
+    fun dummyOriginServerTs(roomId: String): Long {
+        return realmSessionProvider.withRealm { realm ->
+            (RoomSummaryEventsHelper.getLatestPreviewableEvent(realm, roomId, false)?.root?.originServerTs ?: System.currentTimeMillis()) + 1
+        }
     }
 
     fun createReplyTextEvent(roomId: String,
@@ -459,7 +464,7 @@ internal class LocalEchoEventFactory @Inject constructor(
         val localId = LocalEcho.createLocalEchoId()
         return Event(
                 roomId = roomId,
-                originServerTs = dummyOriginServerTs(),
+                originServerTs = dummyOriginServerTs(roomId),
                 senderId = userId,
                 eventId = localId,
                 type = EventType.REDACTION,

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryEventsHelper.kt

@@ -33,11 +33,11 @@ internal object RoomSummaryEventsHelper {
             filterEdits = true
     )
 
-    fun getLatestPreviewableEvent(realm: Realm, roomId: String): TimelineEventEntity? {
+    fun getLatestPreviewableEvent(realm: Realm, roomId: String, includeSending: Boolean = true): TimelineEventEntity? {
         return TimelineEventEntity.latestEvent(
                 realm = realm,
                 roomId = roomId,
-                includesSending = true,
+                includesSending = includeSending,
                 filters = previewFilters
         )
     }

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/DefaultTimeline.kt

@@ -408,7 +408,7 @@ internal class DefaultTimeline(
     }
 
     private fun createSnapshot(): List<TimelineEvent> {
-        return buildSendingEvents() + builtEvents.toList()
+        return (buildSendingEvents() + builtEvents.toList()).sortedByDescending { it.root.originServerTs }
     }
 
     private fun buildSendingEvents(): List<TimelineEvent> {