mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

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')); return migrateColor(this.get('color'));
}, },
getAvatarPath() { 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) { if (avatar && avatar.path) {
return getAbsoluteAttachmentPath(avatar.path); return getAbsoluteAttachmentPath(avatar.path);