ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-04 20:01:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use display name in state event rendering #2722

Browse Source
This commit is contained in:
Benoit Marty
2024-04-22 12:35:46 +02:00
committed by Benoit Marty
parent 461f144585
commit 1d6b479d38
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt
+4 -4
View File
@@ -38,12 +38,12 @@ class RoomMembershipContentFormatter @Inject constructor(
MembershipChange.JOINED -> if (memberIsYou) { MembershipChange.JOINED -> if (memberIsYou) {
sp.getString(R.string.state_event_room_join_by_you) sp.getString(R.string.state_event_room_join_by_you)
} else { } else {
sp.getString(R.string.state_event_room_join, userId.value) sp.getString(R.string.state_event_room_join, senderDisambiguatedDisplayName)
} }
MembershipChange.LEFT -> if (memberIsYou) { MembershipChange.LEFT -> if (memberIsYou) {
sp.getString(R.string.state_event_room_leave_by_you) sp.getString(R.string.state_event_room_leave_by_you)
} else { } else {
sp.getString(R.string.state_event_room_leave, userId.value) sp.getString(R.string.state_event_room_leave, senderDisambiguatedDisplayName)
} }
MembershipChange.BANNED, MembershipChange.KICKED_AND_BANNED -> if (senderIsYou) { MembershipChange.BANNED, MembershipChange.KICKED_AND_BANNED -> if (senderIsYou) {
sp.getString(R.string.state_event_room_ban_by_you, userId.value) sp.getString(R.string.state_event_room_ban_by_you, userId.value)
@@ -85,7 +85,7 @@ class RoomMembershipContentFormatter @Inject constructor(
MembershipChange.KNOCKED -> if (memberIsYou) { MembershipChange.KNOCKED -> if (memberIsYou) {
sp.getString(R.string.state_event_room_knock_by_you) sp.getString(R.string.state_event_room_knock_by_you)
} else { } else {
sp.getString(R.string.state_event_room_knock, userId.value) sp.getString(R.string.state_event_room_knock, senderDisambiguatedDisplayName)
} }
MembershipChange.KNOCK_ACCEPTED -> if (senderIsYou) { MembershipChange.KNOCK_ACCEPTED -> if (senderIsYou) {
sp.getString(R.string.state_event_room_knock_accepted_by_you, userId.value) sp.getString(R.string.state_event_room_knock_accepted_by_you, userId.value)
@@ -95,7 +95,7 @@ class RoomMembershipContentFormatter @Inject constructor(
MembershipChange.KNOCK_RETRACTED -> if (memberIsYou) { MembershipChange.KNOCK_RETRACTED -> if (memberIsYou) {
sp.getString(R.string.state_event_room_knock_retracted_by_you) sp.getString(R.string.state_event_room_knock_retracted_by_you)
} else { } else {
sp.getString(R.string.state_event_room_knock_retracted, userId.value) sp.getString(R.string.state_event_room_knock_retracted, senderDisambiguatedDisplayName)
} }
MembershipChange.KNOCK_DENIED -> if (senderIsYou) { MembershipChange.KNOCK_DENIED -> if (senderIsYou) {
sp.getString(R.string.state_event_room_knock_denied_by_you, userId.value) sp.getString(R.string.state_event_room_knock_denied_by_you, userId.value)
libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt
+4 -4
View File
@@ -264,7 +264,7 @@ class DefaultRoomLastMessageFormatterTest {
val someoneJoinedRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent) val someoneJoinedRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
val someoneJoinedRoom = formatter.format(someoneJoinedRoomEvent, false) val someoneJoinedRoom = formatter.format(someoneJoinedRoomEvent, false)
assertThat(someoneJoinedRoom).isEqualTo("${someoneContent.userId} joined the room") assertThat(someoneJoinedRoom).isEqualTo("$otherName joined the room")
} }
@Test @Test
@@ -280,7 +280,7 @@ class DefaultRoomLastMessageFormatterTest {
val someoneLeftRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent) val someoneLeftRoomEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
val someoneLeftRoom = formatter.format(someoneLeftRoomEvent, false) val someoneLeftRoom = formatter.format(someoneLeftRoomEvent, false)
assertThat(someoneLeftRoom).isEqualTo("${someoneContent.userId} left the room") assertThat(someoneLeftRoom).isEqualTo("$otherName left the room")
} }
@Test @Test
@@ -421,7 +421,7 @@ class DefaultRoomLastMessageFormatterTest {
val someoneKnockedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent) val someoneKnockedEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
val someoneKnocked = formatter.format(someoneKnockedEvent, false) val someoneKnocked = formatter.format(someoneKnockedEvent, false)
assertThat(someoneKnocked).isEqualTo("${someoneContent.userId} requested to join") assertThat(someoneKnocked).isEqualTo("$otherName requested to join")
} }
@Test @Test
@@ -452,7 +452,7 @@ class DefaultRoomLastMessageFormatterTest {
val someoneRetractedKnockEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent) val someoneRetractedKnockEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = someoneContent)
val someoneRetractedKnock = formatter.format(someoneRetractedKnockEvent, false) val someoneRetractedKnock = formatter.format(someoneRetractedKnockEvent, false)
assertThat(someoneRetractedKnock).isEqualTo("${someoneContent.userId} is no longer interested in joining") assertThat(someoneRetractedKnock).isEqualTo("$otherName is no longer interested in joining")
} }
@Test @Test