From 24e2f1a8e0e4e0005c395b5fed0d301d94e82a71 Mon Sep 17 00:00:00 2001 From: Florian Renaud Date: Mon, 6 Sep 2021 15:58:18 +0200 Subject: [PATCH 1/3] Room details: Check power level before showing topic hint --- .../home/room/detail/timeline/item/MergedRoomCreationItem.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt index 43a9618a06..1044cd7d44 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt @@ -143,7 +143,8 @@ abstract class MergedRoomCreationItem : BasedMergedItem Date: Mon, 6 Sep 2021 16:23:40 +0200 Subject: [PATCH 2/3] Room details: Check power level before showing add people button --- .../room/detail/timeline/factory/MergedHeaderItemFactory.kt | 1 + .../room/detail/timeline/item/MergedRoomCreationItem.kt | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt index f552266a1c..25b5dc34d6 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/factory/MergedHeaderItemFactory.kt @@ -206,6 +206,7 @@ class MergedHeaderItemFactory @Inject constructor(private val activeSessionHolde callback = callback, currentUserId = currentUserId, roomSummary = partialState.roomSummary, + canInvite = powerLevelsHelper?.isUserAbleToInvite(currentUserId) ?: false, canChangeAvatar = powerLevelsHelper?.isUserAllowedToSend(currentUserId, true, EventType.STATE_ROOM_AVATAR) ?: false, canChangeTopic = powerLevelsHelper?.isUserAllowedToSend(currentUserId, true, EventType.STATE_ROOM_TOPIC) ?: false, canChangeName = powerLevelsHelper?.isUserAllowedToSend(currentUserId, true, EventType.STATE_ROOM_NAME) ?: false diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt index 1044cd7d44..2305cc3754 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MergedRoomCreationItem.kt @@ -190,8 +190,9 @@ abstract class MergedRoomCreationItem : BasedMergedItem Date: Mon, 6 Sep 2021 16:37:40 +0200 Subject: [PATCH 3/3] towncrier --- changelog.d/3959.feature | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/3959.feature diff --git a/changelog.d/3959.feature b/changelog.d/3959.feature new file mode 100644 index 0000000000..ac1116dad9 --- /dev/null +++ b/changelog.d/3959.feature @@ -0,0 +1 @@ +Check power level before displaying actions in the room details' timeline \ No newline at end of file