Clean

SignalServiceKit/protobuf/SignalService.proto

@@ -245,7 +245,7 @@ message DataMessage {
     enum Type {
       NEW                = 0; // groupPublicKey, name, groupPrivateKey, senderKeys, members, admins
       INFO               = 1; // groupPublicKey, name, senderKeys, members, admins
-      SENDER_KEY_REQUEST = 2; // groupPublicKey
+      SENDER_KEY_REQUEST = 2; // groupPublicKey, members
       SENDER_KEY         = 3; // groupPublicKey, senderKeys
       
     }

SignalServiceKit/src/Loki/Protocol/Closed Groups/ClosedGroupsProtocol.swift

@@ -285,10 +285,12 @@ public final class ClosedGroupsProtocol : NSObject {
         // Update the group
         let newGroupModel = TSGroupModel(title: name, memberIds: members, image: nil, groupId: groupID, groupType: .closedGroup, adminIds: admins)
         thread.setGroupModel(newGroupModel, with: transaction)
-        // Notify the user
-        let infoMessageType: TSInfoMessageType = wasUserRemoved ? .typeGroupQuit : .typeGroupUpdate
-        let infoMessage = TSInfoMessage(timestamp: NSDate.ows_millisecondTimeStamp(), in: thread, messageType: infoMessageType)
-        infoMessage.save(with: transaction)
+        // Notify the user if needed (don't notify them if the message just contained linked device sender keys)
+        if Set(members) != Set(oldMembers) || Set(admins) != Set(group.groupAdminIds) || name != group.groupName {
+            let infoMessageType: TSInfoMessageType = wasUserRemoved ? .typeGroupQuit : .typeGroupUpdate
+            let infoMessage = TSInfoMessage(timestamp: NSDate.ows_millisecondTimeStamp(), in: thread, messageType: infoMessageType)
+            infoMessage.save(with: transaction)
+        }
     }
 
     private static func handleSenderKeyRequestMessage(_ closedGroupUpdate: SSKProtoDataMessageClosedGroupUpdate, from senderPublicKey: String, using transaction: YapDatabaseReadWriteTransaction) {