diff --git a/app/src/main/kotlin/com/wire/android/mapper/SystemMessageContentMapper.kt b/app/src/main/kotlin/com/wire/android/mapper/SystemMessageContentMapper.kt index 4ffc5794908..bf262e2bacd 100644 --- a/app/src/main/kotlin/com/wire/android/mapper/SystemMessageContentMapper.kt +++ b/app/src/main/kotlin/com/wire/android/mapper/SystemMessageContentMapper.kt @@ -274,6 +274,7 @@ class SystemMessageContentMapper @Inject constructor( FailedToAdd.Type.Federation -> UIMessageContent.SystemMessage.MemberFailedToAdd.Type.Federation FailedToAdd.Type.LegalHold -> UIMessageContent.SystemMessage.MemberFailedToAdd.Type.LegalHold FailedToAdd.Type.Unknown -> UIMessageContent.SystemMessage.MemberFailedToAdd.Type.Unknown + FailedToAdd.Type.MissingKeyPackages -> UIMessageContent.SystemMessage.MemberFailedToAdd.Type.MissingKeyPackages } ) diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/SystemMessageItem.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/SystemMessageItem.kt index fe8dadcdfcf..3908dcf8c1f 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/SystemMessageItem.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/SystemMessageItem.kt @@ -476,6 +476,7 @@ private fun SystemMessage.buildContent(isWireCellsEnabled: Boolean) = when (this Type.Federation -> R.string.url_message_details_offline_backends_learn_more Type.LegalHold -> R.string.url_legal_hold_learn_more Type.Unknown -> null + Type.MissingKeyPackages -> R.string.url_mls_learn_more } ) { expanded -> val markdownTextStyle = DefaultMarkdownTextStyle.copy( @@ -492,6 +493,7 @@ private fun SystemMessage.buildContent(isWireCellsEnabled: Boolean) = when (this Type.Federation -> R.plurals.label_system_message_conversation_failed_add_members_details_federation Type.LegalHold -> R.plurals.label_system_message_conversation_failed_add_members_details_legal_hold Type.Unknown -> R.plurals.label_system_message_conversation_failed_add_members_details_unknown + Type.MissingKeyPackages -> R.plurals.label_system_message_conversation_failed_add_members_details_missing_key_packages }, count = memberNames.size, formatArgs = arrayOf(memberNames.limitList(expanded).toListMarkdownString()) diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/model/UIMessage.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/model/UIMessage.kt index 5b9df34c008..eeb3c390dc3 100644 --- a/app/src/main/kotlin/com/wire/android/ui/home/conversations/model/UIMessage.kt +++ b/app/src/main/kotlin/com/wire/android/ui/home/conversations/model/UIMessage.kt @@ -567,7 +567,7 @@ sealed interface UIMessageContent { val memberNames: List, val type: Type, ) : SystemMessage { - enum class Type { Federation, LegalHold, Unknown; } + enum class Type { Federation, LegalHold, Unknown, MissingKeyPackages; } } @Serializable diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2bfa85ba05c..02df86bf5de 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -276,6 +276,7 @@ https://support.wire.com/hc/articles/203121850 https://support.wire.com/hc/articles/360002018278 https://support.wire.com/hc/articles/9357718008093 + https://support.wire.com/hc/articles/12434725011485 https://support.wire.com/hc/articles/212053645 https://support.wire.com/hc/articles/360000665277 https://support.wire.com/hc/articles/207692235 @@ -873,6 +874,10 @@ %1$s could not be added to the conversation. %1$s could not be added to the conversation. + + %1$s could not be added to the conversation. They may not have an MLS-capable client. + %1$s could not be added to the conversation. They may not have MLS-capable clients. + This conversation is no longer verified, as at least one participant started using a new device or has an invalid certificate. This conversation is no longer verified, as at least one participant started using a new device or has an invalid certificate. All devices are verified (end-to-end identity) diff --git a/kalium b/kalium index ec51422c7c6..08d396ece05 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit ec51422c7c6ccc3046699991853149b2153490ee +Subproject commit 08d396ece058c5a3a2a77c96190916b8d2b5c06d