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

Properly download new group avatars

Browse source
This commit is contained in:
Scott Nonnenberg 2019-06-24 11:51:33 -07:00 committed by Ken Powers
parent d97dae6a87
commit ab2cc6ee53
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/models/messages.js
View file

@ -1480,7 +1480,7 @@
}; };
} }
let group = this.get('group'); let group = this.get('group_update');
if (group && group.avatar) { if (group && group.avatar) {
group = { group = {
...group, ...group,

9
js/modules/attachment_downloads.js
View file

@ -364,10 +364,11 @@ async function _addAttachmentToMessage(message, attachment, { type, index }) {
} }
if (type === 'group-avatar') { if (type === 'group-avatar') {
const conversationId = message.get('conversationid'); const conversationId = message.get('conversationId');
const conversation = ConversationController.get(conversationId); const conversation = ConversationController.get(conversationId);
if (!conversation) { if (!conversation) {
logger.warn("_addAttachmentToMessage: conversation didn't exist"); logger.warn("_addAttachmentToMessage: conversation didn't exist");
return;
} }
const existingAvatar = conversation.get('avatar'); const existingAvatar = conversation.get('avatar');
@ -375,11 +376,13 @@ async function _addAttachmentToMessage(message, attachment, { type, index }) {
await Signal.Migrations.deleteAttachmentData(existingAvatar.path); await Signal.Migrations.deleteAttachmentData(existingAvatar.path);
} }
const data = await Signal.Migrations.loadAttachmentData(attachment.path); const loadedAttachment = await Signal.Migrations.loadAttachmentData(
attachment
);
conversation.set({ conversation.set({
avatar: { avatar: {
...attachment, ...attachment,
hash: await computeHash(data), hash: await computeHash(loadedAttachment.data),
}, },
}); });
await Signal.Data.updateConversation( await Signal.Data.updateConversation(