Merge pull request #407 from vector-im/feature/pending_edits_ux

Feature/pending edits ux

CHANGES.md

@@ -5,6 +5,7 @@ Features:
  -
 
 Improvements:
+ - UI for pending edits (#193)
  - UX image preview screen transition (#393)
 
 Other changes:

matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/EventRelationsAggregationTask.kt

@@ -83,21 +83,21 @@ internal class DefaultEventRelationsAggregationTask @Inject constructor(
                         if (event.unsignedData?.relations?.annotations != null) {
                             Timber.v("###REACTION Agreggation in room $roomId for event ${event.eventId}")
                             handleInitialAggregatedRelations(event, roomId, event.unsignedData.relations.annotations, realm)
-                        } else {
+
-                            val content: MessageContent? = event.content.toModel()
+                            EventAnnotationsSummaryEntity.where(realm, event.eventId
-                            if (content?.relatesTo?.type == RelationType.REPLACE) {
+                                    ?: "").findFirst()?.let {
-                                Timber.v("###REPLACE in room $roomId for event ${event.eventId}")
+                                TimelineEventEntity.where(realm, eventId = event.eventId
-                                //A replace!
+                                        ?: "").findFirst()?.let { tet ->
-                                handleReplace(realm, event, content, roomId, isLocalEcho)
+                                    tet.annotations = it
+                                }
                             }
                         }
 
-                        EventAnnotationsSummaryEntity.where(realm, event.eventId
+                        val content: MessageContent? = event.content.toModel()
-                                ?: "").findFirst()?.let {
+                        if (content?.relatesTo?.type == RelationType.REPLACE) {
-                            TimelineEventEntity.where(realm, eventId = event.eventId
+                            Timber.v("###REPLACE in room $roomId for event ${event.eventId}")
-                                    ?: "").findFirst()?.let { tet ->
+                            //A replace!
-                                tet.annotations = it
+                            handleReplace(realm, event, content, roomId, isLocalEcho)
-                            }
                         }
 
 
@@ -178,11 +178,12 @@ internal class DefaultEventRelationsAggregationTask @Inject constructor(
             Timber.v("###REPLACE new edit summary for ${targetEventId}, creating one (localEcho:$isLocalEcho)")
             //create the edit summary
             val editSummary = realm.createObject(EditAggregatedSummaryEntity::class.java)
-            editSummary.lastEditTs = event.originServerTs ?: System.currentTimeMillis()
             editSummary.aggregatedContent = ContentMapper.map(newContent)
             if (isLocalEcho) {
+                editSummary.lastEditTs = 0
                 editSummary.sourceLocalEchoEvents.add(eventId)
             } else {
+                editSummary.lastEditTs = event.originServerTs ?: 0
                 editSummary.sourceEvents.add(eventId)
             }
 
@@ -200,13 +201,26 @@ internal class DefaultEventRelationsAggregationTask @Inject constructor(
                 Timber.v("###REPLACE Receiving remote echo of edit (edit already done)")
                 existingSummary.sourceLocalEchoEvents.remove(txId)
                 existingSummary.sourceEvents.add(event.eventId)
-            } else if (event.originServerTs ?: 0 > existingSummary.lastEditTs) {
+            } else if (
+                    isLocalEcho // do not rely on ts for local echo, take it
+                    || event.originServerTs ?: 0 >= existingSummary.lastEditTs
+            ) {
                 Timber.v("###REPLACE Computing aggregated edit summary (isLocalEcho:$isLocalEcho)")
-                existingSummary.lastEditTs = event.originServerTs ?: System.currentTimeMillis()
+                if (!isLocalEcho) {
+                    //Do not take local echo originServerTs here, could mess up ordering (keep old ts)
+                    existingSummary.lastEditTs = event.originServerTs ?: System.currentTimeMillis()
+                }
                 existingSummary.aggregatedContent = ContentMapper.map(newContent)
-                existingSummary.sourceEvents.add(eventId)
+                if (isLocalEcho) {
+                    existingSummary.sourceLocalEchoEvents.add(eventId)
+                } else {
+                    existingSummary.sourceEvents.add(eventId)
+                }
             } else {
-                //ignore this event for the summary
+                //ignore this event for the summary (back paginate)
+                if (!isLocalEcho) {
+                    existingSummary.sourceEvents.add(eventId)
+                }
                 Timber.v("###REPLACE ignoring event for summary, it's to old $eventId")
             }
         }

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/factory/MessageItemFactory.kt

@@ -41,11 +41,13 @@ import im.vector.riotx.core.epoxy.VectorEpoxyModel
 import im.vector.riotx.core.linkify.VectorLinkify
 import im.vector.riotx.core.resources.ColorProvider
 import im.vector.riotx.core.resources.StringProvider
+import im.vector.riotx.core.resources.UserPreferencesProvider
 import im.vector.riotx.core.utils.DebouncedClickListener
 import im.vector.riotx.features.home.AvatarRenderer
 import im.vector.riotx.features.home.room.detail.timeline.TimelineEventController
 import im.vector.riotx.features.home.room.detail.timeline.helper.ContentUploadStateTrackerBinder
 import im.vector.riotx.features.home.room.detail.timeline.helper.TimelineMediaSizeProvider
+import im.vector.riotx.features.home.room.detail.timeline.helper.senderAvatar
 import im.vector.riotx.features.home.room.detail.timeline.item.*
 import im.vector.riotx.features.home.room.detail.timeline.util.MessageInformationDataFactory
 import im.vector.riotx.features.html.EventHtmlRenderer
@@ -63,7 +65,8 @@ class MessageItemFactory @Inject constructor(
         private val emojiCompatFontProvider: EmojiCompatFontProvider,
         private val imageContentRenderer: ImageContentRenderer,
         private val messageInformationDataFactory: MessageInformationDataFactory,
-        private val contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder) {
+        private val contentUploadStateTrackerBinder: ContentUploadStateTrackerBinder,
+        private val userPreferencesProvider: UserPreferencesProvider) {
 
 
     fun create(event: TimelineEvent,
@@ -89,7 +92,26 @@ class MessageItemFactory @Inject constructor(
                 || event.isEncrypted() && event.root.content.toModel<EncryptedEventContent>()?.relatesTo?.type == RelationType.REPLACE
         ) {
             // ignore replace event, the targeted id is already edited
-            return BlankItem_()
+            if (userPreferencesProvider.shouldShowHiddenEvents()) {
+                //These are just for debug to display hidden event, they should be filtered out in normal mode
+                val informationData = MessageInformationData(
+                        eventId = event.root.eventId ?: "?",
+                        senderId = event.root.senderId ?: "",
+                        sendState = event.sendState,
+                        time = "",
+                        avatarUrl = event.senderAvatar(),
+                        memberName = "",
+                        showInformation = false
+                )
+                return NoticeItem_()
+                        .avatarRenderer(avatarRenderer)
+                        .informationData(informationData)
+                        .noticeText("{ \"type\": ${event.root.getClearType()} }")
+                        .highlighted(highlight)
+                        .baseCallback(callback)
+            } else {
+                return BlankItem_()
+            }
         }
 //        val all = event.root.toContent()
 //        val ev = all.toModel<Event>()

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/AbsMessageItem.kt

@@ -29,6 +29,7 @@ import androidx.core.view.children
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import com.airbnb.epoxy.EpoxyAttribute
+import im.vector.matrix.android.api.session.room.send.SendState
 import im.vector.riotx.R
 import im.vector.riotx.core.resources.ColorProvider
 import im.vector.riotx.core.utils.DebouncedClickListener
@@ -163,7 +164,8 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : BaseEventItem<H>() {
 
     protected fun renderSendState(root: View, textView: TextView?) {
         root.isClickable = informationData.sendState.isSent()
-        textView?.setTextColor(colorProvider.getMessageTextColor(informationData.sendState))
+        val state = if (informationData.hasPendingEdits) SendState.UNSENT else informationData.sendState
+        textView?.setTextColor(colorProvider.getMessageTextColor(state))
     }
 
     abstract class Holder(@IdRes stubId: Int) : BaseHolder(stubId) {

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/item/MessageInformationData.kt

@@ -30,8 +30,9 @@ data class MessageInformationData(
         val memberName: CharSequence? = null,
         val showInformation: Boolean = true,
         /*List of reactions (emoji,count,isSelected)*/
-        var orderedReactionList: List<ReactionInfoData>? = null,
+        val orderedReactionList: List<ReactionInfoData>? = null,
-        var hasBeenEdited: Boolean = false
+        val hasBeenEdited: Boolean = false,
+        val hasPendingEdits: Boolean = false
 ) : Parcelable
 
 

vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/util/MessageInformationDataFactory.kt

@@ -74,7 +74,8 @@ class MessageInformationDataFactory @Inject constructor(private val timelineDate
                         ?.map {
                             ReactionInfoData(it.key, it.count, it.addedByMe, it.localEchoEvents.isEmpty())
                         },
-                hasBeenEdited = hasBeenEdited
+                hasBeenEdited = hasBeenEdited,
+                hasPendingEdits = event.annotations?.editSummary?.localEchos?.any() ?: false
         )
     }
 }