From 1e562c82933ed8f44190f7dfc8cec3e5320bd18d Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Wed, 24 Oct 2018 11:31:01 -0700
Subject: [PATCH] Properly handle avatar changes in group update messages

---
 js/models/messages.js | 25 +++++++++++++++++++++----
 js/modules/signal.js  |  4 ++--
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/js/models/messages.js b/js/models/messages.js
index 2beca3b94..149e9362c 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -19,10 +19,12 @@
 
   const { Message: TypedMessage, Contact, PhoneNumber } = Signal.Types;
   const {
+    deleteAttachmentData,
     deleteExternalMessageFiles,
     getAbsoluteAttachmentPath,
     loadAttachmentData,
     loadQuoteData,
+    writeNewAttachmentData,
   } = window.Signal.Migrations;
 
   window.AccountCache = Object.create(null);
@@ -1033,28 +1035,43 @@
       return conversation.queueJob(async () => {
         try {
           const now = new Date().getTime();
-          let attributes = { type: 'private' };
+          let attributes = {
+            ...conversation.attributes,
+          };
           if (dataMessage.group) {
             let groupUpdate = null;
             attributes = {
+              ...attributes,
               type: 'group',
               groupId: dataMessage.group.id,
             };
             if (dataMessage.group.type === GROUP_TYPES.UPDATE) {
               attributes = {
-                type: 'group',
-                groupId: dataMessage.group.id,
+                ...attributes,
                 name: dataMessage.group.name,
-                avatar: dataMessage.group.avatar,
                 members: _.union(
                   dataMessage.group.members,
                   conversation.get('members')
                 ),
               };
+
+              // Update this group conversations's avatar on disk if it has changed.
+              if (dataMessage.group.avatar) {
+                attributes = await window.Signal.Types.Conversation.maybeUpdateAvatar(
+                  attributes,
+                  dataMessage.group.avatar.data,
+                  {
+                    writeNewAttachmentData,
+                    deleteAttachmentData,
+                  }
+                );
+              }
+
               groupUpdate =
                 conversation.changedAttributes(
                   _.pick(dataMessage.group, 'name', 'avatar')
                 ) || {};
+
               const difference = _.difference(
                 attributes.members,
                 conversation.get('members')
diff --git a/js/modules/signal.js b/js/modules/signal.js
index fcc4d022d..0bf5ef297 100644
--- a/js/modules/signal.js
+++ b/js/modules/signal.js
@@ -119,6 +119,7 @@ function initializeMigrations({
 
   return {
     attachmentsPath,
+    deleteAttachmentData: deleteOnDisk,
     deleteExternalMessageFiles: MessageType.deleteAllExternalFiles({
       deleteAttachmentData: Type.deleteData(deleteOnDisk),
       deleteOnDisk,
@@ -131,8 +132,6 @@ function initializeMigrations({
     loadMessage: MessageType.createAttachmentLoader(loadAttachmentData),
     Migrations0DatabaseWithAttachmentData,
     Migrations1DatabaseWithoutAttachmentData,
-    writeNewAttachmentData: createWriterForNew(attachmentsPath),
-    deleteAttachmentData: deleteOnDisk,
     upgradeMessageSchema: (message, options = {}) => {
       const { maxVersion } = options;
 
@@ -153,6 +152,7 @@ function initializeMigrations({
       writeExistingAttachmentData: createWriterForExisting(attachmentsPath),
       logger,
     }),
+    writeNewAttachmentData: createWriterForNew(attachmentsPath),
   };
 }