Revision 3322c5c9
| ChatSecure/Classes/View Controllers/OTRMessagesViewController.m | ||
|---|---|---|
| 1643 | 1643 |
return nil; |
| 1644 | 1644 |
} |
| 1645 | 1645 |
|
| 1646 |
if (!message.isMessageIncoming) {
|
|
| 1647 |
return [self accountAvatarImage]; |
|
| 1648 |
} |
|
| 1649 |
|
|
| 1646 | 1650 |
NSError *messageError = [message messageError]; |
| 1647 | 1651 |
if ((messageError && !messageError.isAutomaticDownloadError) || |
| 1648 | 1652 |
![self isMessageTrusted:message]) {
|
| ... | ... | |
| 1667 | 1671 |
if (!avatarImage) {
|
| 1668 | 1672 |
avatarImage = [roomOccupant avatarImage]; |
| 1669 | 1673 |
} |
| 1670 |
} else {
|
|
| 1674 |
} else if (roomMessage.senderJID) {
|
|
| 1671 | 1675 |
avatarImage = [OTRImages avatarImageWithUsername:[[XMPPJID jidWithString:roomMessage.senderJID] resource]]; |
| 1676 |
} else {
|
|
| 1677 |
return nil; |
|
| 1672 | 1678 |
} |
| 1673 | 1679 |
if (avatarImage) {
|
| 1674 | 1680 |
NSUInteger diameter = MIN(avatarImage.size.width, avatarImage.size.height); |
Also available in: Unified diff