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

Fix stickers display text on room summary (#3221)

Browse source 
Signed-off-by: Marco Antonio Alvarez <surakin@gmail.com>
This commit is contained in:
Marco Antonio Alvarez 2024-07-19 22:14:22 +02:00 • committed by GitHub
parent bc87ff01cf
commit cdcaace227
2 changed files with 4 additions and 3 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

@ -85,7 +85,7 @@ class DefaultRoomLastMessageFormatter @Inject constructor(
} }
} }
is StickerContent -> { is StickerContent -> {
content.body prefixIfNeeded(sp.getString(CommonStrings.common_sticker) + " (" + content.body + ")", senderDisambiguatedDisplayName, isDmRoom)
} }
is UnableToDecryptContent -> { is UnableToDecryptContent -> {
val message = sp.getString(CommonStrings.common_waiting_for_decryption_key) val message = sp.getString(CommonStrings.common_waiting_for_decryption_key)

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

@ -105,11 +105,12 @@ class DefaultRoomLastMessageFormatterTest {
@Test @Test
@Config(qualifiers = "en") @Config(qualifiers = "en")
fun `Sticker content`() { fun `Sticker content`() {
val body = "body" val body = "a sticker body"
val info = ImageInfo(null, null, null, null, null, null, null) val info = ImageInfo(null, null, null, null, null, null, null)
val message = createRoomEvent(false, null, StickerContent(body, info, aMediaSource(url = "url"))) val message = createRoomEvent(false, null, StickerContent(body, info, aMediaSource(url = "url")))
val result = formatter.format(message, false) val result = formatter.format(message, false)
assertThat(result).isEqualTo(body) val expectedBody = someoneElseId.toString() + ": Sticker (a sticker body)"
assertThat(result.toString()).isEqualTo(expectedBody)
} }
@Test @Test