Skip to content

fix: failure message for adding user with no mls client (WPB-17105) #4659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sbakhtiarov wants to merge 1 commit into
base: develop
Choose a base branch
from
+9 −1
Open

fix: failure message for adding user with no mls client (WPB-17105) #4659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/kotlin/com/wire/android/mapper/SystemMessageContentMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
)

Expand Down
2 changes: 2 additions & 0 deletions ...src/main/kotlin/com/wire/android/ui/home/conversations/messages/item/SystemMessageItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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())
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/wire/android/ui/home/conversations/model/UIMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ sealed interface UIMessageContent {
val memberNames: List<UIText>,
val type: Type,
) : SystemMessage {
enum class Type { Federation, LegalHold, Unknown; }
enum class Type { Federation, LegalHold, Unknown, MissingKeyPackages; }
}

@Serializable
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@
<string name="url_learn_about_search" translatable="false">https://support.wire.com/hc/articles/203121850</string>
<string name="url_legal_hold_learn_more" translatable="false">https://support.wire.com/hc/articles/360002018278</string>
<string name="url_message_details_offline_backends_learn_more" translatable="false">https://support.wire.com/hc/articles/9357718008093</string>
<string name="url_mls_learn_more" translatable="false">https://support.wire.com/hc/en-us/articles/12434725011485-Messaging-Layer-Security-MLS</string>
Copy link
Contributor

@saleniuk saleniuk Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would suggest to remove the locale part, we usually use these urls without it, so that the article will open using the current device's locale. You can also shorten this url, just like all others, to have only id of the article, like so: https://support.wire.com/hc/articles/12434725011485

<string name="url_message_details_reactions_learn_more" translatable="false">https://support.wire.com/hc/articles/212053645</string>
<string name="url_message_details_read_receipts_learn_more" translatable="false">https://support.wire.com/hc/articles/360000665277</string>
<string name="url_self_client_fingerprint_learn_more" translatable="false">https://support.wire.com/hc/articles/207692235</string>
Expand Down Expand Up @@ -873,6 +874,10 @@
<item quantity="one">%1$s could not be added to the conversation.</item>
<item quantity="other">%1$s could not be added to the conversation.</item>
</plurals>
<plurals name="label_system_message_conversation_failed_add_members_details_missing_key_packages">
<item quantity="one">%1$s could not be added to the conversation. They may not have an MLS-capable client.</item>
<item quantity="other">%1$s could not be added to the conversation. They may not have MLS-capable clients.</item>
</plurals>
<string name="label_system_message_conversation_degraded_mls">This conversation is no longer verified, as at least one participant started using a new device or has an invalid certificate.</string>
<string name="label_system_message_conversation_degraded_proteus">This conversation is no longer verified, as at least one participant started using a new device or has an invalid certificate.</string>
<string name="label_system_message_conversation_verified_mls">All devices are verified (end-to-end identity)</string>
Expand Down
Loading