Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix invalid userId.

Browse source
This commit is contained in:
Benoit Marty 2026-05-06 18:27:49 +02:00
parent f7346efde4
commit a6880af921
4 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@ import io.element.android.features.roomcall.api.aStandByCallState
import io.element.android.libraries.designsystem.components.avatar.AvatarData import io.element.android.libraries.designsystem.components.avatar.AvatarData
import io.element.android.libraries.designsystem.components.avatar.AvatarSize import io.element.android.libraries.designsystem.components.avatar.AvatarSize
import io.element.android.libraries.designsystem.preview.ROOM_NAME import io.element.android.libraries.designsystem.preview.ROOM_NAME
import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE import io.element.android.libraries.designsystem.preview.USER_NAME_SENDER
import io.element.android.libraries.matrix.api.core.EventId import io.element.android.libraries.matrix.api.core.EventId
import io.element.android.libraries.matrix.api.core.TransactionId import io.element.android.libraries.matrix.api.core.TransactionId
import io.element.android.libraries.matrix.api.core.UniqueId import io.element.android.libraries.matrix.api.core.UniqueId
@ -145,7 +145,7 @@ internal fun aTimelineItemEvent(
isMine: Boolean = false, isMine: Boolean = false,
isEditable: Boolean = false, isEditable: Boolean = false,
canBeRepliedTo: Boolean = false, canBeRepliedTo: Boolean = false,
senderDisplayName: String = USER_NAME_ALICE, senderDisplayName: String = USER_NAME_SENDER,
displayNameAmbiguous: Boolean = false, displayNameAmbiguous: Boolean = false,
content: TimelineItemEventContent = aTimelineItemTextContent(), content: TimelineItemEventContent = aTimelineItemTextContent(),
groupPosition: TimelineItemGroupPosition = TimelineItemGroupPosition.None, groupPosition: TimelineItemGroupPosition = TimelineItemGroupPosition.None,
@ -162,7 +162,7 @@ internal fun aTimelineItemEvent(
eventId = eventId, eventId = eventId,
transactionId = transactionId, transactionId = transactionId,
senderId = UserId("@senderId:domain"), senderId = UserId("@senderId:domain"),
senderAvatar = AvatarData("@senderId:domain", "sender", size = AvatarSize.TimelineSender), senderAvatar = AvatarData("@senderId:domain", USER_NAME_SENDER, size = AvatarSize.TimelineSender),
content = content, content = content,
reactionsState = timelineItemReactions, reactionsState = timelineItemReactions,
readReceiptState = readReceiptState, readReceiptState = readReceiptState,

1
libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/preview/PreviewData.kt
View file

@ -16,6 +16,7 @@ const val USER_NAME_EVE = "Eve"
const val USER_NAME_JOHN_DOE = "John Doe" const val USER_NAME_JOHN_DOE = "John Doe"
const val USER_NAME_JUSTIN = "Justin" const val USER_NAME_JUSTIN = "Justin"
const val USER_NAME_MALLORY = "Mallory" const val USER_NAME_MALLORY = "Mallory"
const val USER_NAME_SENDER = "Sender"
const val USER_NAME_SUSIE = "Susie" const val USER_NAME_SUSIE = "Susie"
const val USER_NAME_VICTOR = "Victor" const val USER_NAME_VICTOR = "Victor"
const val USER_NAME_WALTER = "Walter" const val USER_NAME_WALTER = "Walter"

2
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/MatrixUserProvider.kt
View file

@ -44,7 +44,7 @@ fun aMatrixUser(
displayName: String? = USER_NAME_ALICE, displayName: String? = USER_NAME_ALICE,
avatarUrl: String? = null, avatarUrl: String? = null,
) = MatrixUser( ) = MatrixUser(
userId = UserId(id ?: "@${displayName?.lowercase() ?: "id_of_alice"}:server.org"), userId = UserId(id ?: "@${displayName?.lowercase()?.replace(" ", "_") ?: "id_of_alice"}:server.org"),
displayName = displayName, displayName = displayName,
avatarUrl = avatarUrl, avatarUrl = avatarUrl,
) )

4
libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/messages/reply/InReplyToDetailsProvider.kt
View file

@ -9,7 +9,7 @@
package io.element.android.libraries.matrix.ui.messages.reply package io.element.android.libraries.matrix.ui.messages.reply
import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import io.element.android.libraries.designsystem.preview.USER_NAME_ALICE import io.element.android.libraries.designsystem.preview.USER_NAME_SENDER
import io.element.android.libraries.matrix.api.core.EventId 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.core.UserId
import io.element.android.libraries.matrix.api.media.MediaSource import io.element.android.libraries.matrix.api.media.MediaSource
@ -160,7 +160,7 @@ private fun aInReplyToDetails(
) )
fun aProfileDetailsReady( fun aProfileDetailsReady(
displayName: String? = USER_NAME_ALICE, displayName: String? = USER_NAME_SENDER,
displayNameAmbiguous: Boolean = false, displayNameAmbiguous: Boolean = false,
avatarUrl: String? = null, avatarUrl: String? = null,
) = ProfileDetails.Ready( ) = ProfileDetails.Ready(