Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show target user avatars for collapsed membership changes #4148

Merged
merged 1 commit into from
Feb 7, 2022
Merged

Show target user avatars for collapsed membership changes #4148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGES.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Changes to be released in next version
*

🙌 Improvements
*
* Show target user avatars for collapsed membership changes (#4102).

🐛 Bugfix
*
Expand Down
8 changes: 4 additions & 4 deletions Riot/Modules/Room/Views/BubbleCells/RoomMembershipCollapsedBubbleCell.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,18 @@ - (void)render:(MXKCellData *)cellData
// Handle user's picture by considering it is stored unencrypted on Matrix media repository

// Use the Riot style placeholder
if (!nextBubbleData.senderAvatarPlaceholder)
if (!nextBubbleData.targetAvatarPlaceholder)
{
nextBubbleData.senderAvatarPlaceholder = [AvatarGenerator generateAvatarForMatrixItem:nextBubbleData.senderId withDisplayName:nextBubbleData.senderDisplayName];
nextBubbleData.targetAvatarPlaceholder = [AvatarGenerator generateAvatarForMatrixItem:nextBubbleData.targetId withDisplayName:nextBubbleData.targetDisplayName];
}

avatarView.enableInMemoryCache = YES;
[avatarView setImageURI:nextBubbleData.senderAvatarUrl
[avatarView setImageURI:nextBubbleData.targetAvatarUrl
withType:nil
andImageOrientation:UIImageOrientationUp
toFitViewSize:avatarView.frame.size
withMethod:MXThumbnailingMethodCrop
previewImage:nextBubbleData.senderAvatarPlaceholder
previewImage:nextBubbleData.targetAvatarPlaceholder
mediaManager:nextBubbleData.mxSession.mediaManager];

// Clear the default background color of a MXKImageView instance
Expand Down