ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 21:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1767 from vector-im/feature/bma/encryptedMessages

Browse Source 
Feature/bma/encrypted messages
This commit is contained in:
Benoit Marty
2023-11-08 11:58:38 +01:00
committed by GitHub
parent 74e5bf18fc 64a00eec16
commit d99ed8517e
7 changed files with 12 additions and 12 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/DefaultRoomLastMessageFormatter.kt
+1 -1
View File
@@ -81,7 +81,7 @@ class DefaultRoomLastMessageFormatter @Inject constructor(
content.body
}
is UnableToDecryptContent -> {
val message = sp.getString(CommonStrings.common_decryption_error)
val message = sp.getString(CommonStrings.common_waiting_for_decryption_key)
if (!isDmRoom) {
prefix(message, senderDisplayName)
} else {
libraries/eventformatter/impl/src/test/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatterTest.kt
+1 -1
View File
@@ -113,7 +113,7 @@ class DefaultRoomLastMessageFormatterTest {
@Test
@Config(qualifiers = "en")
fun `Unable to decrypt content`() {
val expected = "Decryption error"
val expected = "Waiting for this message"
val senderName = "Someone"
sequenceOf(false, true).forEach { isDm ->
val message = createRoomEvent(false, senderName, UnableToDecryptContent(UnableToDecryptContent.Data.Unknown))