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 bf262e2bac..bffa835128 100644 --- a/app/src/main/kotlin/com/wire/android/mapper/SystemMessageContentMapper.kt +++ b/app/src/main/kotlin/com/wire/android/mapper/SystemMessageContentMapper.kt @@ -226,6 +226,7 @@ class SystemMessageContentMapper @Inject constructor( return UIMessageContent.SystemMessage.RenamedConversation(authorName, content.conversationName) } + @Suppress("CyclomaticComplexMethod") fun mapMemberChangeMessage( content: MemberChange, senderUserId: UserId, @@ -286,6 +287,8 @@ class SystemMessageContentMapper @Inject constructor( author = authorName, memberNames = memberNameList ) + + is MemberChange.SelfUserPromotedToAdmin -> UIMessageContent.SystemMessage.SelfUserPromotedToAdmin } } 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 3908dcf8c1..7d58b12cdc 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 @@ -540,6 +540,13 @@ private fun SystemMessage.buildContent(isWireCellsEnabled: Boolean) = when (this } } + is SystemMessage.SelfUserPromotedToAdmin -> buildContent( + iconResId = R.drawable.ic_member_role_updated, + iconTintColor = MaterialTheme.wireColorScheme.onBackground, + ) { + stringResource(id = R.string.label_system_message_admin_role_assigned).toMarkdownAnnotatedString() + } + is SystemMessage.NewConversationWithCellStarted -> buildContent( iconResId = R.drawable.ic_files, iconTintColor = MaterialTheme.wireColorScheme.onBackground, 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 03628259c3..41b28e31c6 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 @@ -612,6 +612,9 @@ sealed interface UIMessageContent { } } + @Serializable + data object SelfUserPromotedToAdmin : SystemMessage + @Serializable data object NewConversationWithCellStarted : SystemMessage diff --git a/app/src/main/res/drawable/ic_member_role_updated.xml b/app/src/main/res/drawable/ic_member_role_updated.xml new file mode 100644 index 0000000000..67b6e04b86 --- /dev/null +++ b/app/src/main/res/drawable/ic_member_role_updated.xml @@ -0,0 +1,27 @@ + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6e155a5fc0..fea52bdd6c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1978,5 +1978,6 @@ In group conversations, the group admin can overwrite this setting. %1$s enabled **apps** for this conversation %1$s disabled **apps** for this conversation Added apps have access to the content of this conversation. + You were promoted to group admin More information about this backend diff --git a/kalium b/kalium index ac51876ffc..9a0b40b5dc 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit ac51876ffcddb1e12b10bdb23aec3d38e6dcdfda +Subproject commit 9a0b40b5dc7cbf73dc156fc690222a18d4673759