Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-24 20:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

For 'me,' prefer signal profile avatar over address book info

Browse Source
This commit is contained in:
Scott Nonnenberg
2019-06-07 10:51:41 -07:00
committed by Ken Powers
parent 3505ab9198
commit dd98477479
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/models/conversations.js
View File

@@ -2019,7 +2019,9 @@
return migrateColor(this.get('color'));
},
getAvatarPath() {
const avatar = this.get('avatar') || this.get('profileAvatar');
const avatar = this.isMe()
? this.get('profileAvatar') || this.get('avatar')
: this.get('avatar') || this.get('profileAvatar');
if (avatar && avatar.path) {
return getAbsoluteAttachmentPath(avatar.path);