Adapt 'change roles' screens to the new creator/owner role (#5076)

* Replace `RoomMember.Role.CREATOR` with `RoomMember.Role.Owner` - Make `RoomMember.Role` a sealed interface instead

* Adapt room member role mapping to include the power level to distinguish between admins and owners

* Use new `RoomMember.Role` sealed interface through the app

* Change how `MembersByRole` groups members to add owners to the admins section

* Adapt the `ChangeRoles` screen to the new roles:
    - Owners can't modify other owner's roles.
    - They can modify the roles of any other user, without confirmation.

* Adapt 'roles and permissions' screen:
    - Owners can't demote themselves.
    - The admin count also counts owners.

* Add more tests and screenshots

* Add owners to its own section in the 'change roles' screen

* Update screenshots

---------

Co-authored-by: ElementBot <[email protected]>

Author: jmartinesp

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/suggestions/SuggestionsPickerView.kt

@@ -157,7 +157,7 @@ internal fun SuggestionsPickerViewPreview() {
             powerLevel = 0L,
             normalizedPowerLevel = 0L,
             isIgnored = false,
-            role = RoomMember.Role.USER,
+            role = RoomMember.Role.User,
             membershipChangeReason = null,
         )
         val anAlias = remember { RoomAlias("#room:domain.org") }

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsStateProvider.kt

@@ -69,7 +69,7 @@ fun aDmRoomMember(
     powerLevel: Long = 0,
     normalizedPowerLevel: Long = powerLevel,
     isIgnored: Boolean = false,
-    role: RoomMember.Role = RoomMember.Role.USER,
+    role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
 ) = RoomMember(
     userId = userId,

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/analytics/AnalyticUtils.kt

@@ -13,10 +13,10 @@ import io.element.android.libraries.matrix.api.room.powerlevels.RoomPowerLevelsV
 import io.element.android.services.analytics.api.AnalyticsService
 
 internal fun RoomMember.Role.toAnalyticsMemberRole(): RoomModeration.Role = when (this) {
-    RoomMember.Role.CREATOR -> RoomModeration.Role.Administrator // TODO - distinguish creator from admin
-    RoomMember.Role.ADMIN -> RoomModeration.Role.Administrator
-    RoomMember.Role.MODERATOR -> RoomModeration.Role.Moderator
-    RoomMember.Role.USER -> RoomModeration.Role.User
+    is RoomMember.Role.Owner -> RoomModeration.Role.Administrator // TODO - distinguish creator from admin
+    RoomMember.Role.Admin -> RoomModeration.Role.Administrator
+    RoomMember.Role.Moderator -> RoomModeration.Role.Moderator
+    RoomMember.Role.User -> RoomModeration.Role.User
 }
 
 internal fun analyticsMemberRoleForPowerLevel(powerLevel: Long): RoomModeration.Role {

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListStateProvider.kt

@@ -150,7 +150,7 @@ fun aRoomMember(
     powerLevel: Long = 0L,
     normalizedPowerLevel: Long = 0L,
     isIgnored: Boolean = false,
-    role: RoomMember.Role = RoomMember.Role.USER,
+    role: RoomMember.Role = RoomMember.Role.User,
     membershipChangeReason: String? = null,
 ) = RoomMember(
     userId = userId,
@@ -178,8 +178,8 @@ fun aRoomMemberList() = persistentListOf(
     aWalter(),
 )
 
-fun anAlice() = aRoomMember(UserId("@alice:server.org"), "Alice", role = RoomMember.Role.ADMIN)
-fun aBob() = aRoomMember(UserId("@bob:server.org"), "Bob", role = RoomMember.Role.MODERATOR)
+fun anAlice() = aRoomMember(UserId("@alice:server.org"), "Alice", role = RoomMember.Role.Admin)
+fun aBob() = aRoomMember(UserId("@bob:server.org"), "Bob", role = RoomMember.Role.Moderator)
 
 fun aVictor() = aRoomMember(UserId("@victor:server.org"), "Victor", membership = RoomMembershipState.INVITE)
 

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/RoomMemberListView.kt

@@ -61,7 +61,6 @@ import io.element.android.libraries.designsystem.theme.components.TopAppBar
 import io.element.android.libraries.matrix.api.encryption.identity.IdentityState
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.getBestName
-import io.element.android.libraries.matrix.api.room.isOwner
 import io.element.android.libraries.matrix.api.room.toMatrixUser
 import io.element.android.libraries.matrix.ui.components.MatrixUserRow
 import io.element.android.libraries.ui.strings.CommonStrings
@@ -295,14 +294,11 @@ private fun RoomMemberListItem(
     modifier: Modifier = Modifier,
 ) {
     val member = roomMemberWithIdentity.roomMember
-    val roleText = if (member.isOwner()) {
-        stringResource(R.string.screen_room_member_list_role_owner)
-    } else {
-        when (member.role) {
-            RoomMember.Role.ADMIN -> stringResource(R.string.screen_room_member_list_role_administrator)
-            RoomMember.Role.MODERATOR -> stringResource(R.string.screen_room_member_list_role_moderator)
-            else -> null
-        }
+    val roleText = when (member.role) {
+        RoomMember.Role.Admin -> stringResource(R.string.screen_room_member_list_role_administrator)
+        RoomMember.Role.Moderator -> stringResource(R.string.screen_room_member_list_role_moderator)
+        is RoomMember.Role.Owner -> stringResource(R.string.screen_room_member_list_role_owner)
+        else -> null
     }
 
     MatrixUserRow(

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsNode.kt

@@ -61,7 +61,7 @@ class RolesAndPermissionsNode @AssistedInject constructor(
             room.roomInfoFlow
                 .filter { info ->
                     val role = info.roleOf(room.sessionId)
-                    role != RoomMember.Role.ADMIN && role != RoomMember.Role.CREATOR
+                    role != RoomMember.Role.Admin && role !is RoomMember.Role.Owner
                 }
                 .take(1)
                 .onEach { navigateUp() }

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsPresenter.kt

@@ -26,6 +26,7 @@ import io.element.android.libraries.matrix.api.room.RoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMember
 import io.element.android.libraries.matrix.api.room.activeRoomMembers
 import io.element.android.libraries.matrix.api.room.powerlevels.UserRoleChange
+import io.element.android.libraries.matrix.ui.model.roleOf
 import io.element.android.services.analytics.api.AnalyticsService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
@@ -50,14 +51,23 @@ class RolesAndPermissionsPresenter @Inject constructor(
         }
         val moderatorCount by remember {
             derivedStateOf {
-                roomInfo.userCountWithRole(activeRoomMemberIds, RoomMember.Role.MODERATOR)
+                roomInfo.userCountWithRole(activeRoomMemberIds, RoomMember.Role.Moderator)
             }
         }
         val adminCount by remember {
             derivedStateOf {
-                roomInfo.userCountWithRole(activeRoomMemberIds, RoomMember.Role.ADMIN)
+                val admins = roomInfo.userCountWithRole(activeRoomMemberIds, RoomMember.Role.Admin)
+                val ownersCount = if (roomInfo.privilegedCreatorRole) {
+                    val superAdmins = roomInfo.userCountWithRole(activeRoomMemberIds, RoomMember.Role.Owner(isCreator = false))
+                    val creators = roomInfo.userCountWithRole(activeRoomMemberIds, RoomMember.Role.Owner(isCreator = true))
+                    superAdmins + creators
+                } else {
+                    0
+                }
+                admins + ownersCount
             }
         }
+        val canDemoteSelf = remember { derivedStateOf { roomInfo.roleOf(room.sessionId) !is RoomMember.Role.Owner } }
         val changeOwnRoleAction = remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized) }
         val resetPermissionsAction = remember { mutableStateOf<AsyncAction<Unit>>(AsyncAction.Uninitialized) }
 
@@ -83,8 +93,10 @@ class RolesAndPermissionsPresenter @Inject constructor(
         }
 
         return RolesAndPermissionsState(
+            roomSupportsOwnerRole = roomInfo.privilegedCreatorRole,
             adminCount = adminCount,
             moderatorCount = moderatorCount,
+            canDemoteSelf = canDemoteSelf.value,
             changeOwnRoleAction = changeOwnRoleAction.value,
             resetPermissionsAction = resetPermissionsAction.value,
             eventSink = { handleEvent(it) },

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsState.kt

@@ -10,8 +10,10 @@ package io.element.android.features.roomdetails.impl.rolesandpermissions
 import io.element.android.libraries.architecture.AsyncAction
 
 data class RolesAndPermissionsState(
+    val roomSupportsOwnerRole: Boolean,
     val adminCount: Int,
     val moderatorCount: Int,
+    val canDemoteSelf: Boolean,
     val changeOwnRoleAction: AsyncAction<Unit>,
     val resetPermissionsAction: AsyncAction<Unit>,
     val eventSink: (RolesAndPermissionsEvents) -> Unit,

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsStateProvider.kt

@@ -13,7 +13,7 @@ import io.element.android.libraries.architecture.AsyncAction
 class RolesAndPermissionsStateProvider : PreviewParameterProvider<RolesAndPermissionsState> {
     override val values: Sequence<RolesAndPermissionsState>
         get() = sequenceOf(
-            aRolesAndPermissionsState(),
+            aRolesAndPermissionsState(roomSupportsOwners = false),
             aRolesAndPermissionsState(adminCount = 1, moderatorCount = 2),
             aRolesAndPermissionsState(
                 adminCount = 1,
@@ -45,17 +45,22 @@ class RolesAndPermissionsStateProvider : PreviewParameterProvider<RolesAndPermis
                 moderatorCount = 2,
                 resetPermissionsAction = AsyncAction.Failure(IllegalStateException("Failed to reset permissions")),
             ),
+            aRolesAndPermissionsState(canDemoteSelf = false),
         )
 }
 
 internal fun aRolesAndPermissionsState(
+    roomSupportsOwners: Boolean = true,
     adminCount: Int = 0,
     moderatorCount: Int = 0,
+    canDemoteSelf: Boolean = true,
     changeOwnRoleAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     resetPermissionsAction: AsyncAction<Unit> = AsyncAction.Uninitialized,
     eventSink: (RolesAndPermissionsEvents) -> Unit = {},
 ) = RolesAndPermissionsState(
+    roomSupportsOwnerRole = roomSupportsOwners,
     adminCount = adminCount,
+    canDemoteSelf = canDemoteSelf,
     moderatorCount = moderatorCount,
     changeOwnRoleAction = changeOwnRoleAction,
     resetPermissionsAction = resetPermissionsAction,

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/rolesandpermissions/RolesAndPermissionsView.kt

@@ -55,8 +55,14 @@ fun RolesAndPermissionsView(
         onBackClick = rolesAndPermissionsNavigator::onBackClick,
     ) {
         ListSectionHeader(title = stringResource(R.string.screen_room_roles_and_permissions_roles_header), hasDivider = false)
+
+        val adminsTitle = if (state.roomSupportsOwnerRole) {
+            stringResource(R.string.screen_room_roles_and_permissions_admins_and_owners)
+        } else {
+            stringResource(R.string.screen_room_roles_and_permissions_admins)
+        }
         ListItem(
-            headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_admins)) },
+            headlineContent = { Text(adminsTitle) },
             leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Admin())),
             trailingContent = ListItemContent.Text("${state.adminCount}"),
             onClick = { rolesAndPermissionsNavigator.openAdminList() },
@@ -67,11 +73,13 @@ fun RolesAndPermissionsView(
             trailingContent = ListItemContent.Text("${state.moderatorCount}"),
             onClick = { rolesAndPermissionsNavigator.openModeratorList() },
         )
-        ListItem(
-            headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_change_my_role)) },
-            onClick = { state.eventSink(RolesAndPermissionsEvents.ChangeOwnRole) },
-            leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Edit()))
-        )
+        if (state.canDemoteSelf) {
+            ListItem(
+                headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_change_my_role)) },
+                onClick = { state.eventSink(RolesAndPermissionsEvents.ChangeOwnRole) },
+                leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Edit()))
+            )
+        }
         ListSectionHeader(title = stringResource(R.string.screen_room_roles_and_permissions_permissions_header), hasDivider = true)
         ListItem(
             headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_room_details)) },
@@ -170,7 +178,7 @@ private fun ChangeOwnRoleBottomSheet(
             headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_change_role_demote_to_moderator)) },
             onClick = {
                 sheetState.hide(coroutineScope) {
-                    eventSink(RolesAndPermissionsEvents.DemoteSelfTo(RoomMember.Role.MODERATOR))
+                    eventSink(RolesAndPermissionsEvents.DemoteSelfTo(RoomMember.Role.Moderator))
                 }
             },
             style = ListItemStyle.Destructive,
@@ -179,7 +187,7 @@ private fun ChangeOwnRoleBottomSheet(
             headlineContent = { Text(stringResource(R.string.screen_room_roles_and_permissions_change_role_demote_to_member)) },
             onClick = {
                 sheetState.hide(coroutineScope) {
-                    eventSink(RolesAndPermissionsEvents.DemoteSelfTo(RoomMember.Role.USER))
+                    eventSink(RolesAndPermissionsEvents.DemoteSelfTo(RoomMember.Role.User))
                 }
             },
             style = ListItemStyle.Destructive,