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

Use userId on display name change state events (#2545)

Browse source 
* Use `userId` on display name change state events
This commit is contained in:
Jorge Martin Espinosa 2024-03-14 09:46:20 +01:00 • committed by GitHub
parent 0473c4b5f0
commit 6c1f90ed77
5 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt
View file

@ -97,7 +97,7 @@ class DefaultRoomLastMessageFormatter @Inject constructor(
roomMembershipContentFormatter.format(content, senderDisplayName, isOutgoing)
}
is ProfileChangeContent -> {
profileChangeContentFormatter.format(content, senderDisplayName, isOutgoing)
profileChangeContentFormatter.format(content, event.sender, senderDisplayName, isOutgoing)
}
is StateContent -> {
stateContentFormatter.format(content, senderDisplayName, isOutgoing, RenderingMode.RoomList)

2
libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultTimelineEventFormatter.kt
View file

@ -54,7 +54,7 @@ class DefaultTimelineEventFormatter @Inject constructor(
roomMembershipContentFormatter.format(content, senderDisplayName, isOutgoing)
}
is ProfileChangeContent -> {
profileChangeContentFormatter.format(content, senderDisplayName, isOutgoing)
profileChangeContentFormatter.format(content, event.sender, senderDisplayName, isOutgoing)
}
is StateContent -> {
stateContentFormatter.format(content, senderDisplayName, isOutgoing, RenderingMode.Timeline)

10
libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/ProfileChangeContentFormatter.kt
View file

@ -16,6 +16,7 @@
package io.element.android.libraries.eventformatter.impl
import io.element.android.libraries.matrix.api.core.UserId
import io.element.android.libraries.matrix.api.timeline.item.event.ProfileChangeContent
import io.element.android.services.toolbox.api.strings.StringProvider
import javax.inject.Inject
@ -25,6 +26,7 @@ class ProfileChangeContentFormatter @Inject constructor(
) {
fun format(
profileChangeContent: ProfileChangeContent,
senderId: UserId,
senderDisplayName: String,
senderIsYou: Boolean,
): String? = profileChangeContent.run {
@ -32,7 +34,7 @@ class ProfileChangeContentFormatter @Inject constructor(
val avatarChanged = avatarUrl != prevAvatarUrl
return when {
avatarChanged && displayNameChanged -> {
val message = format(profileChangeContent.copy(avatarUrl = null, prevAvatarUrl = null), senderDisplayName, senderIsYou)
val message = format(profileChangeContent.copy(avatarUrl = null, prevAvatarUrl = null), senderId, senderDisplayName, senderIsYou)
val avatarChangedToo = sp.getString(R.string.state_event_avatar_changed_too)
"$message\n$avatarChangedToo"
}
@ -41,19 +43,19 @@ class ProfileChangeContentFormatter @Inject constructor(
if (senderIsYou) {
sp.getString(R.string.state_event_display_name_changed_from_by_you, prevDisplayName, displayName)
} else {
sp.getString(R.string.state_event_display_name_changed_from, senderDisplayName, prevDisplayName, displayName)
sp.getString(R.string.state_event_display_name_changed_from, senderId.value, prevDisplayName, displayName)
}
} else if (displayName != null) {
if (senderIsYou) {
sp.getString(R.string.state_event_display_name_set_by_you, displayName)
} else {
sp.getString(R.string.state_event_display_name_set, senderDisplayName, displayName)
sp.getString(R.string.state_event_display_name_set, senderId.value, displayName)
}
} else {
if (senderIsYou) {
sp.getString(R.string.state_event_display_name_removed_by_you, prevDisplayName)
} else {
sp.getString(R.string.state_event_display_name_removed, senderDisplayName, prevDisplayName)
sp.getString(R.string.state_event_display_name_removed, senderId.value, prevDisplayName)
}
}
}