From 97eaf680859a072fb9c2f7ad77368b5c2653ce04 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 5 Oct 2020 11:29:02 +1100 Subject: [PATCH] clean getExistingSenderKeysForGroup as we don't need the diff anymore --- ts/session/medium_group/index.ts | 18 +++--------------- ts/session/medium_group/ratchet.ts | 1 - 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/ts/session/medium_group/index.ts b/ts/session/medium_group/index.ts index ac00cfc7b..4949066a4 100644 --- a/ts/session/medium_group/index.ts +++ b/ts/session/medium_group/index.ts @@ -269,26 +269,14 @@ async function getExistingSenderKeysForGroup( // as they each member need to regenerate a new senderkey async function getOrUpdateSenderKeysForJoiningMembers( groupId: string, - members: Array, - diff?: GroupDiff, - joiningMembersSenderKeys?: Array + members: Array ): Promise> { - const leavingMembers = diff?.leavingMembers || []; - const joiningMembers = diff?.joiningMembers || []; - - const existingMembers = _.difference(members, joiningMembers); // get all devices for members const allDevices = _.flatten( - await Promise.all( - existingMembers.map(m => MultiDeviceProtocol.getAllDevices(m)) - ) + await Promise.all(members.map(m => MultiDeviceProtocol.getAllDevices(m))) ); - let existingKeys: Array = []; - if (leavingMembers.length === 0) { - existingKeys = await getExistingSenderKeysForGroup(groupId, allDevices); - } - return _.union(joiningMembersSenderKeys, existingKeys); + return getExistingSenderKeysForGroup(groupId, allDevices); } async function getGroupSecretKey(groupId: string): Promise { diff --git a/ts/session/medium_group/ratchet.ts b/ts/session/medium_group/ratchet.ts index 5808ad4bf..5f9d81db9 100644 --- a/ts/session/medium_group/ratchet.ts +++ b/ts/session/medium_group/ratchet.ts @@ -290,5 +290,4 @@ async function decryptWithSenderKeyInner( await getMessageQueue().send(sender, requestKeysMessage); } } - }