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

Use prefixIfNeeded (equivalent code)

Browse source
This commit is contained in:
Benoit Marty 2024-09-26 15:31:42 +02:00
parent bc9ea1c18c
commit 2468592ec0
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,11 +64,7 @@ class DefaultRoomLastMessageFormatter @Inject constructor(
is MessageContent -> content.process(senderDisambiguatedDisplayName, isDmRoom) is MessageContent -> content.process(senderDisambiguatedDisplayName, isDmRoom)
RedactedContent -> { RedactedContent -> {
val message = sp.getString(CommonStrings.common_message_removed) val message = sp.getString(CommonStrings.common_message_removed)
if (!isDmRoom) { message.prefixIfNeeded(senderDisambiguatedDisplayName, isDmRoom)
message.prefixWith(senderDisambiguatedDisplayName)
} else {
message
}
} }
is StickerContent -> { is StickerContent -> {
val message = sp.getString(CommonStrings.common_sticker) + " (" + content.body + ")" val message = sp.getString(CommonStrings.common_sticker) + " (" + content.body + ")"
@ -76,11 +72,7 @@ class DefaultRoomLastMessageFormatter @Inject constructor(
} }
is UnableToDecryptContent -> { is UnableToDecryptContent -> {
val message = sp.getString(CommonStrings.common_waiting_for_decryption_key) val message = sp.getString(CommonStrings.common_waiting_for_decryption_key)
if (!isDmRoom) { message.prefixIfNeeded(senderDisambiguatedDisplayName, isDmRoom)
message.prefixWith(senderDisambiguatedDisplayName)
} else {
message
}
} }
is RoomMembershipContent -> { is RoomMembershipContent -> {
roomMembershipContentFormatter.format(content, senderDisambiguatedDisplayName, isOutgoing) roomMembershipContentFormatter.format(content, senderDisambiguatedDisplayName, isOutgoing)