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

Consider that the topic of a room has been removed when it's blank. (#4206)

Browse source
This commit is contained in:
Benoit Marty 2025-01-28 15:46:07 +01:00 • committed by Benoit Marty
parent c7f035fea5
commit 07dbb0b47a
2 changed files with 10 additions and 1 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/StateContentFormatter.kt
View file

@ -63,7 +63,7 @@ class StateContentFormatter @Inject constructor(
} }
} }
is OtherState.RoomTopic -> { is OtherState.RoomTopic -> {
val hasRoomTopic = content.topic != null val hasRoomTopic = content.topic?.isNotBlank() == true
when { when {
senderIsYou && hasRoomTopic -> sp.getString(R.string.state_event_room_topic_changed_by_you, content.topic) senderIsYou && hasRoomTopic -> sp.getString(R.string.state_event_room_topic_changed_by_you, content.topic)
senderIsYou && !hasRoomTopic -> sp.getString(R.string.state_event_room_topic_removed_by_you) senderIsYou && !hasRoomTopic -> sp.getString(R.string.state_event_room_topic_removed_by_you)

9
libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt
View file

@ -662,6 +662,7 @@ class DefaultRoomLastMessageFormatterTest {
val roomTopic = "New topic" val roomTopic = "New topic"
val changedContent = StateContent("", OtherState.RoomTopic(roomTopic)) val changedContent = StateContent("", OtherState.RoomTopic(roomTopic))
val removedContent = StateContent("", OtherState.RoomTopic(null)) val removedContent = StateContent("", OtherState.RoomTopic(null))
val blankContent = StateContent("", OtherState.RoomTopic(""))
val youChangedRoomTopicEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent) val youChangedRoomTopicEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = changedContent)
val youChangedRoomTopic = formatter.format(youChangedRoomTopicEvent, false) val youChangedRoomTopic = formatter.format(youChangedRoomTopicEvent, false)
@ -678,6 +679,14 @@ class DefaultRoomLastMessageFormatterTest {
val someoneRemovedRoomTopicEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent) val someoneRemovedRoomTopicEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = removedContent)
val someoneRemovedRoomTopic = formatter.format(someoneRemovedRoomTopicEvent, false) val someoneRemovedRoomTopic = formatter.format(someoneRemovedRoomTopicEvent, false)
assertThat(someoneRemovedRoomTopic).isEqualTo("$otherName removed the room topic") assertThat(someoneRemovedRoomTopic).isEqualTo("$otherName removed the room topic")
val youSetBlankRoomTopicEvent = createRoomEvent(sentByYou = true, senderDisplayName = null, content = blankContent)
val youSetBlankRoomTopic = formatter.format(youSetBlankRoomTopicEvent, false)
assertThat(youSetBlankRoomTopic).isEqualTo("You removed the room topic")
val someoneSetBlankRoomTopicEvent = createRoomEvent(sentByYou = false, senderDisplayName = otherName, content = blankContent)
val someoneSetBlankRoomTopic = formatter.format(someoneSetBlankRoomTopicEvent, false)
assertThat(someoneSetBlankRoomTopic).isEqualTo("$otherName removed the room topic")
} }
@Test @Test