Format state Event: use disambiguated Display name #2722.

- Rename some parameter and val from `senderDisplayName` (and consort) to `senderDisambiguatedDisplayName`.
- In `InReplyToDetails`, replace `senderDisplayName` and `senderAvatarUrl` by `senderProfile`.

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt

@@ -269,9 +269,9 @@ private fun MessageSummary(event: TimelineItem.Event, modifier: Modifier = Modif
         Spacer(modifier = Modifier.width(8.dp))
         Column(modifier = Modifier.weight(1f)) {
             Row {
-                if (event.senderDisplayName != null) {
+                if (event.senderDisambiguatedDisplayName != null) {
                     Text(
-                        text = event.senderDisplayName,
+                        text = event.senderDisambiguatedDisplayName,
                         style = ElementTheme.typography.fontBodySmMedium,
                         color = MaterialTheme.colorScheme.primary
                     )

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/TimelineStateProvider.kt

@@ -130,7 +130,7 @@ internal fun aTimelineItemEvent(
     transactionId: TransactionId? = null,
     isMine: Boolean = false,
     isEditable: Boolean = false,
-    senderDisplayName: String = "Sender",
+    senderDisambiguatedDisplayName: String = "Sender",
     content: TimelineItemEventContent = aTimelineItemTextContent(),
     groupPosition: TimelineItemGroupPosition = TimelineItemGroupPosition.None,
     sendState: LocalEventSendState? = null,
@@ -152,7 +152,7 @@ internal fun aTimelineItemEvent(
         sentTime = "12:34",
         isMine = isMine,
         isEditable = isEditable,
-        senderDisplayName = senderDisplayName,
+        senderDisambiguatedDisplayName = senderDisambiguatedDisplayName,
         groupPosition = groupPosition,
         localSendState = sendState,
         inReplyTo = inReplyTo,

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt

@@ -106,6 +106,7 @@ import io.element.android.libraries.designsystem.theme.components.Icon
 import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.matrix.api.core.EventId
 import io.element.android.libraries.matrix.api.core.UserId
+import io.element.android.libraries.matrix.api.timeline.item.event.getDisambiguatedDisplayName
 import io.element.android.libraries.matrix.ui.components.AttachmentThumbnail
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -561,10 +562,10 @@ private fun MessageEventBubbleContent(
             }
         }
         val inReplyTo = @Composable { inReplyTo: InReplyToDetails ->
-            val senderName = inReplyTo.senderDisplayName ?: inReplyTo.senderId.value
+            val senderDisambiguatedDisplayName = inReplyTo.senderProfile.getDisambiguatedDisplayName(inReplyTo.senderId)
             val topPadding = if (showThreadDecoration) 0.dp else 8.dp
             ReplyToContent(
-                senderName = senderName,
+                senderDisambiguatedDisplayName = senderDisambiguatedDisplayName,
                 metadata = inReplyTo.metadata(),
                 modifier = Modifier
                     .padding(top = topPadding, start = 8.dp, end = 8.dp)
@@ -609,7 +610,7 @@ private fun MessageEventBubbleContent(
 
 @Composable
 private fun ReplyToContent(
-    senderName: String,
+    senderDisambiguatedDisplayName: String,
     metadata: InReplyToMetadata?,
     modifier: Modifier = Modifier,
 ) {
@@ -633,13 +634,13 @@ private fun ReplyToContent(
             )
             Spacer(modifier = Modifier.width(8.dp))
         }
-        val a11InReplyToText = stringResource(CommonStrings.common_in_reply_to, senderName)
+        val a11InReplyToText = stringResource(CommonStrings.common_in_reply_to, senderDisambiguatedDisplayName)
         Column(verticalArrangement = Arrangement.SpaceBetween) {
             Text(
                 modifier = Modifier.semantics {
                     contentDescription = a11InReplyToText
                 },
-                text = senderName,
+                text = senderDisambiguatedDisplayName,
                 style = ElementTheme.typography.fontBodySmMedium,
                 textAlign = TextAlign.Start,
                 color = ElementTheme.materialColors.primary,

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowLongSenderNamePreview.kt

@@ -27,7 +27,7 @@ import io.element.android.libraries.designsystem.preview.ElementPreviewLight
 internal fun TimelineItemEventRowLongSenderNamePreview() = ElementPreviewLight {
     ATimelineItemEventRow(
         event = aTimelineItemEvent(
-            senderDisplayName = "a long sender display name to test single line and ellipsis at the end of the line",
+            senderDisambiguatedDisplayName = "a long sender display name to test single line and ellipsis at the end of the line",
         ),
     )
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowTimestampPreview.kt

@@ -43,7 +43,7 @@ internal fun TimelineItemEventRowTimestampPreview(
                         body = str,
                     ),
                     reactionsState = aTimelineItemReactions(count = 0),
-                    senderDisplayName = "A sender",
+                    senderDisambiguatedDisplayName = "A sender",
                 ),
             )
         }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRowWithReplyPreview.kt

@@ -42,6 +42,7 @@ import io.element.android.libraries.matrix.api.timeline.item.event.MessageConten
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.NoticeMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.PollContent
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.api.timeline.item.event.VideoMessageType
@@ -167,8 +168,11 @@ open class InReplyToDetailsProvider : PreviewParameterProvider<InReplyToDetails>
         eventId = EventId("\$event"),
         eventContent = eventContent,
         senderId = UserId("@Sender:domain"),
-        senderDisplayName = "Sender",
-        senderAvatarUrl = null,
+        senderProfile = ProfileTimelineDetails.Ready(
+            displayName = "Sender",
+            displayNameAmbiguous = false,
+            avatarUrl = null,
+        ),
         textContent = (eventContent as? MessageContent)?.body.orEmpty(),
     )
 }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentFactory.kt

@@ -52,8 +52,12 @@ class TimelineItemContentFactory @Inject constructor(
             is FailedToParseMessageLikeContent -> failedToParseMessageFactory.create(itemContent)
             is FailedToParseStateContent -> failedToParseStateFactory.create(itemContent)
             is MessageContent -> {
-                val senderDisplayName = eventTimelineItem.senderProfile.getDisambiguatedDisplayName(eventTimelineItem.sender)
-                messageFactory.create(itemContent, senderDisplayName, eventTimelineItem.eventId)
+                val senderDisambiguatedDisplayName = eventTimelineItem.senderProfile.getDisambiguatedDisplayName(eventTimelineItem.sender)
+                messageFactory.create(
+                    content = itemContent,
+                    senderDisambiguatedDisplayName = senderDisambiguatedDisplayName,
+                    eventId = eventTimelineItem.eventId,
+                )
             }
             is ProfileChangeContent -> profileChangeFactory.create(eventTimelineItem)
             is RedactedContent -> redactedMessageFactory.create(itemContent)

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentMessageFactory.kt

@@ -70,17 +70,21 @@ class TimelineItemContentMessageFactory @Inject constructor(
     private val htmlConverterProvider: HtmlConverterProvider,
     private val permalinkParser: PermalinkParser,
 ) {
-    suspend fun create(content: MessageContent, senderDisplayName: String, eventId: EventId?): TimelineItemEventContent {
+    suspend fun create(
+        content: MessageContent,
+        senderDisambiguatedDisplayName: String,
+        eventId: EventId?,
+    ): TimelineItemEventContent {
         return when (val messageType = content.type) {
             is EmoteMessageType -> {
-                val emoteBody = "* $senderDisplayName ${messageType.body.trimEnd()}"
+                val emoteBody = "* $senderDisambiguatedDisplayName ${messageType.body.trimEnd()}"
                 TimelineItemEmoteContent(
                     body = emoteBody,
                     htmlDocument = messageType.formatted?.toHtmlDocument(
                         permalinkParser = permalinkParser,
-                        prefix = "* $senderDisplayName",
+                        prefix = "* $senderDisambiguatedDisplayName",
                     ),
-                    formattedBody = parseHtml(messageType.formatted, prefix = "* $senderDisplayName") ?: emoteBody.withLinks(),
+                    formattedBody = parseHtml(messageType.formatted, prefix = "* $senderDisambiguatedDisplayName") ?: emoteBody.withLinks(),
                     isEdited = content.isEdited,
                 )
             }

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemEventFactory.kt

@@ -55,14 +55,14 @@ class TimelineItemEventFactory @Inject constructor(
         val currentSender = currentTimelineItem.event.sender
         val groupPosition =
             computeGroupPosition(currentTimelineItem, timelineItems, index)
-        val (senderDisplayName, senderAvatarUrl) = currentTimelineItem.getSenderInfo()
+        val (senderDisambiguatedDisplayName, senderAvatarUrl) = currentTimelineItem.getSenderInfo()
 
         val timeFormatter = DateFormat.getTimeInstance(DateFormat.SHORT)
         val sentTime = timeFormatter.format(Date(currentTimelineItem.event.timestamp))
 
         val senderAvatarData = AvatarData(
             id = currentSender.value,
-            name = senderDisplayName ?: currentSender.value,
+            name = senderDisambiguatedDisplayName ?: currentSender.value,
             url = senderAvatarUrl,
             size = AvatarSize.TimelineSender
         )
@@ -72,7 +72,7 @@ class TimelineItemEventFactory @Inject constructor(
             eventId = currentTimelineItem.eventId,
             transactionId = currentTimelineItem.transactionId,
             senderId = currentSender,
-            senderDisplayName = senderDisplayName,
+            senderDisambiguatedDisplayName = senderDisambiguatedDisplayName,
             senderAvatar = senderAvatarData,
             content = contentFactory.create(currentTimelineItem.event),
             isMine = currentTimelineItem.event.isOwn,
@@ -100,23 +100,23 @@ class TimelineItemEventFactory @Inject constructor(
     }
 
     private fun MatrixTimelineItem.Event.getSenderInfo(): Pair<String?, String?> {
-        val senderDisplayName: String?
+        val senderDisambiguatedDisplayName: String?
         val senderAvatarUrl: String?
 
         when (val senderProfile = event.senderProfile) {
             ProfileTimelineDetails.Unavailable,
             ProfileTimelineDetails.Pending,
             is ProfileTimelineDetails.Error -> {
-                senderDisplayName = null
+                senderDisambiguatedDisplayName = null
                 senderAvatarUrl = null
             }
             is ProfileTimelineDetails.Ready -> {
-                senderDisplayName = senderProfile.getDisambiguatedDisplayName(event.sender)
+                senderDisambiguatedDisplayName = senderProfile.getDisambiguatedDisplayName(event.sender)
                 senderAvatarUrl = senderProfile.avatarUrl
             }
         }
 
-        return senderDisplayName to senderAvatarUrl
+        return senderDisambiguatedDisplayName to senderAvatarUrl
     }
 
     private fun MatrixTimelineItem.Event.computeReactionsState(): TimelineItemReactions {

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/InReplyToDetails.kt

@@ -22,6 +22,7 @@ import io.element.android.libraries.matrix.api.permalink.PermalinkParser
 import io.element.android.libraries.matrix.api.timeline.item.event.EventContent
 import io.element.android.libraries.matrix.api.timeline.item.event.InReplyTo
 import io.element.android.libraries.matrix.api.timeline.item.event.MessageContent
+import io.element.android.libraries.matrix.api.timeline.item.event.ProfileTimelineDetails
 import io.element.android.libraries.matrix.api.timeline.item.event.StickerContent
 import io.element.android.libraries.matrix.api.timeline.item.event.TextMessageType
 import io.element.android.libraries.matrix.ui.messages.toPlainText
@@ -29,8 +30,7 @@ import io.element.android.libraries.matrix.ui.messages.toPlainText
 data class InReplyToDetails(
     val eventId: EventId,
     val senderId: UserId,
-    val senderDisplayName: String?,
-    val senderAvatarUrl: String?,
+    val senderProfile: ProfileTimelineDetails,
     val eventContent: EventContent?,
     val textContent: String?,
 )
@@ -41,8 +41,7 @@ fun InReplyTo.map(
     is InReplyTo.Ready -> InReplyToDetails(
         eventId = eventId,
         senderId = senderId,
-        senderDisplayName = senderDisplayName,
-        senderAvatarUrl = senderAvatarUrl,
+        senderProfile = senderProfile,
         eventContent = content,
         textContent = when (content) {
             is MessageContent -> {

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/model/TimelineItem.kt

@@ -57,7 +57,7 @@ sealed interface TimelineItem {
         val eventId: EventId? = null,
         val transactionId: TransactionId? = null,
         val senderId: UserId,
-        val senderDisplayName: String?,
+        val senderDisambiguatedDisplayName: String?,
         val senderAvatar: AvatarData,
         val content: TimelineItemEventContent,
         val sentTime: String = "",
@@ -74,7 +74,7 @@ sealed interface TimelineItem {
     ) : TimelineItem {
         val showSenderInformation = groupPosition.isNew() && !isMine
 
-        val safeSenderName: String = senderDisplayName ?: senderId.value
+        val safeSenderName: String = senderDisambiguatedDisplayName ?: senderId.value
 
         val failedToSend: Boolean = localSendState is LocalEventSendState.SendingFailed