From 7115bd34342125b6027ca6c13b6cc6b867299e46 Mon Sep 17 00:00:00 2001 From: ganfra Date: Thu, 27 Nov 2025 18:08:00 +0100 Subject: [PATCH 1/2] change(room member): make sure we never display name/avatar when a member is banned --- .../element/android/libraries/matrix/api/room/RoomMember.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMember.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMember.kt index 5a1f253eaf..0b3d7071c8 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMember.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomMember.kt @@ -99,6 +99,6 @@ fun RoomMember.getBestName(): String { fun RoomMember.toMatrixUser() = MatrixUser( userId = userId, - displayName = displayName, - avatarUrl = avatarUrl, + displayName = displayName.takeUnless { membership == RoomMembershipState.BAN }, + avatarUrl = avatarUrl.takeUnless { membership == RoomMembershipState.BAN }, ) From e315b71f02aa4c4184a743321da03eda7ff0be16 Mon Sep 17 00:00:00 2001 From: ElementBot Date: Thu, 27 Nov 2025 17:28:21 +0000 Subject: [PATCH 2/2] Update screenshots --- ...s.roomdetails.impl.members_RoomMemberListView_Day_3_en.png | 4 ++-- ...roomdetails.impl.members_RoomMemberListView_Night_3_en.png | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_3_en.png index 6ac0644c32..dfbbd46e39 100644 --- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_3_en.png +++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Day_3_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bae192229d384047dcf5fb6744267a9e448d7f0a4f933a4984a0d1c3b9d07da2 -size 30789 +oid sha256:d5ff0c767c13a80f8305096982d1fb92800d3a25fb50115c631fd3916fd7f52c +size 30180 diff --git a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_3_en.png b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_3_en.png index c313f14d52..4f5dba242e 100644 --- a/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_3_en.png +++ b/tests/uitests/src/test/snapshots/images/features.roomdetails.impl.members_RoomMemberListView_Night_3_en.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dc20039c1c5d456f318f22e524360d411d4a4980b6a2a9312c0707c0fe865340 -size 29867 +oid sha256:5fa0396ed5afbb31ef60cbc74c3369e3eb306f0b4eb168424165c6246ea7cdca +size 29276