jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change related to Epoxy 4.6.0 upgrade - step 1.1: handle DSL restriction, other error

This commit is contained in:
Benoit Marty 2021-05-19 11:05:52 +02:00
parent a0d04c40e9
commit 9a9edd979d
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vector/src/main/java/im/vector/app/features/roomprofile/members/RoomMemberListController.kt
View File

@ -140,7 +140,7 @@ class RoomMemberListController @Inject constructor(
?.let { content ->
profileMatrixItem {
id("3pid_$idx")
matrixItem(content.toMatrixItem())
matrixItem(MatrixItem.UserItem("@", displayName = content.displayName))
avatarRenderer(host.avatarRenderer)
editable(data.actionsPermissions.canRevokeThreePidInvite)
clickListener { _ ->
@ -157,8 +157,4 @@ class RoomMemberListController @Inject constructor(
}
)
}
private fun RoomThirdPartyInviteContent.toMatrixItem(): MatrixItem {
return MatrixItem.UserItem("@", displayName = displayName)
}
}

6
vector/src/main/java/im/vector/app/features/spaces/people/SpacePeopleListController.kt
View File

@ -86,7 +86,7 @@ class SpacePeopleListController @Inject constructor(
avatarRenderer(host.avatarRenderer)
userEncryptionTrustLevel(data.trustLevelMap.invoke()?.get(roomMember.userId))
.apply {
val pl = memberEntry.first.toPowerLevelLabel()
val pl = host.toPowerLevelLabel(memberEntry.first)
if (memberEntry.first == RoomMemberListCategories.INVITE) {
powerLevelLabel(
span {
@ -158,8 +158,8 @@ class SpacePeopleListController @Inject constructor(
}
}
private fun RoomMemberListCategories.toPowerLevelLabel(): String? {
return when (this) {
private fun toPowerLevelLabel(categories: RoomMemberListCategories): String? {
return when (categories) {
RoomMemberListCategories.ADMIN -> stringProvider.getString(R.string.power_level_admin)
RoomMemberListCategories.MODERATOR -> stringProvider.getString(R.string.power_level_moderator)
else -> null