From b95c2f8772d18960d3f76fdbf4df59945439fee3 Mon Sep 17 00:00:00 2001
From: ganfra <francoisg@element.io>
Date: Wed, 10 Dec 2025 14:30:09 +0100
Subject: [PATCH] fix(editable avatar) : disable avatar editing if no
 permission

---
 .../features/roomdetailsedit/impl/RoomDetailsEditView.kt        | 1 +
 .../libraries/matrix/ui/components/EditableAvatarView.kt        | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditView.kt b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditView.kt
index 268b30cb31..aedb9bd16b 100644
--- a/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditView.kt
+++ b/features/roomdetailsedit/impl/src/main/kotlin/io/element/android/features/roomdetailsedit/impl/RoomDetailsEditView.kt
@@ -110,6 +110,7 @@ fun RoomDetailsEditView(
                 } else {
                     AvatarType.Room()
                 },
+                enabled = state.canChangeAvatar,
                 onAvatarClick = ::onAvatarClick,
                 modifier = Modifier.fillMaxWidth(),
             )
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
index 7a005402e2..284ffcbab1 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/EditableAvatarView.kt
@@ -56,6 +56,7 @@ fun EditableAvatarView(
     avatarType: AvatarType,
     onAvatarClick: () -> Unit,
     modifier: Modifier = Modifier,
+    enabled: Boolean = true,
 ) {
     val a11yAvatar = stringResource(CommonStrings.a11y_avatar)
     val editIconRadius = 15.dp
@@ -66,6 +67,7 @@ fun EditableAvatarView(
             .wrapContentSize()
             .size(height = parentHeight, width = parentWidth)
             .clickable(
+                enabled = enabled,
                 interactionSource = remember { MutableInteractionSource() },
                 onClickLabel = stringResource(CommonStrings.a11y_edit_avatar),
                 onClick = onAvatarClick,