From 9a2885ed78d0bfb336c17eb61efa48ae681d107a Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Wed, 26 Apr 2023 11:21:20 +0200 Subject: [PATCH] Fix avatar image in MultilineMessageCell (Use always default avatar when address not in contact list) --- Classes/Swift/Chat/Views/MultilineMessageCell.swift | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Classes/Swift/Chat/Views/MultilineMessageCell.swift b/Classes/Swift/Chat/Views/MultilineMessageCell.swift index e93375e67..7cc2f58ef 100644 --- a/Classes/Swift/Chat/Views/MultilineMessageCell.swift +++ b/Classes/Swift/Chat/Views/MultilineMessageCell.swift @@ -20,7 +20,7 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource, var contentMediaViewBubble: UIView = UIView(frame: .zero) var contentBubble: UIView = UIView(frame: .zero) var bubble: UIView = UIView(frame: .zero) - let imageUser = UIImageView()//Avatar(color:VoipTheme.primaryTextColor, textStyle: VoipTheme.chat_conversation_avatar_small) + let imageUser = UIImageView() var contactDateLabel = StyledLabel(VoipTheme.chat_conversation_forward_label) var chatRead = UIImageView(image: UIImage(named: "chat_delivered.png")) @@ -754,9 +754,11 @@ class MultilineMessageCell: SwipeCollectionViewCell, UICollectionViewDataSource, if isFirstIndexInTableView(indexPath: selfIndexPathConfigure, chat: event.chatMessage!) { imageUser.isHidden = false - //imageUser.fillFromAddress(address: (event.chatMessage?.fromAddress)!, withPresence: true) - imageUser.image = FastAddressBook.image(for: event.chatMessage?.fromAddress?.contact()) - //[cell.avatarImage setImage:[FastAddressBook imageForAddress:addr]]; + if event.chatMessage?.fromAddress?.contact() != nil { + imageUser.image = FastAddressBook.image(for: event.chatMessage?.fromAddress?.contact()) + }else{ + imageUser.image = FastAddressBook.image(for: event.chatMessage?.fromAddress?.getCobject) + } contactDateLabel.text = contactDateForChat(message: event.chatMessage!) contactDateLabel.isHidden = false if editMode {