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

sendToGroup: Save conversation before removing senderKey

Browse source
This commit is contained in:
Scott Nonnenberg 2021-08-17 11:35:49 -07:00 • committed by GitHub
parent fe12ca936f
commit 5f3af9f123
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
ts/util/sendToGroup.ts
View file

@ -275,7 +275,7 @@ export async function sendToGroupViaSenderKey(options: {
memberDevices: [], memberDevices: [],
}, },
}); });
await window.Signal.Data.updateConversation(attributes); window.Signal.Data.updateConversation(attributes);
} else if (isOlderThan(attributes.senderKeyInfo.createdAtDate, THIRTY_DAYS)) { } else if (isOlderThan(attributes.senderKeyInfo.createdAtDate, THIRTY_DAYS)) {
const { createdAtDate } = attributes.senderKeyInfo; const { createdAtDate } = attributes.senderKeyInfo;
window.log.info( window.log.info(
@ -397,7 +397,7 @@ export async function sendToGroupViaSenderKey(options: {
memberDevices: updatedMemberDevices, memberDevices: updatedMemberDevices,
}, },
}); });
await window.Signal.Data.updateConversation(conversation.attributes); window.Signal.Data.updateConversation(conversation.attributes);
// Restart here because we might have discovered new or dropped devices as part of // Restart here because we might have discovered new or dropped devices as part of
// distributing our sender key. // distributing our sender key.
@ -424,7 +424,7 @@ export async function sendToGroupViaSenderKey(options: {
memberDevices: updatedMemberDevices, memberDevices: updatedMemberDevices,
}, },
}); });
await window.Signal.Data.updateConversation(conversation.attributes); window.Signal.Data.updateConversation(conversation.attributes);
} }
// 10. Send the Sender Key message! // 10. Send the Sender Key message!
@ -645,7 +645,7 @@ async function markIdentifierUnregistered(identifier: string) {
); );
conversation.setUnregistered(); conversation.setUnregistered();
await window.Signal.Data.updateConversation(conversation.attributes); window.Signal.Data.updateConversation(conversation.attributes);
await window.textsecure.storage.protocol.archiveAllSessions(identifier); await window.textsecure.storage.protocol.archiveAllSessions(identifier);
} }
@ -733,9 +733,7 @@ async function handle410Response(
), ),
}, },
}); });
await window.Signal.Data.updateConversation( window.Signal.Data.updateConversation(conversation.attributes);
conversation.attributes
);
} }
} }
}), }),
@ -1005,11 +1003,6 @@ async function resetSenderKey(conversation: ConversationModel): Promise<void> {
const { distributionId } = senderKeyInfo; const { distributionId } = senderKeyInfo;
const address = getOurAddress(); const address = getOurAddress();
await window.textsecure.storage.protocol.removeSenderKey(
address,
distributionId
);
// Note: We preserve existing distributionId to minimize space for sender key storage // Note: We preserve existing distributionId to minimize space for sender key storage
conversation.set({ conversation.set({
senderKeyInfo: { senderKeyInfo: {
@ -1018,7 +1011,12 @@ async function resetSenderKey(conversation: ConversationModel): Promise<void> {
memberDevices: [], memberDevices: [],
}, },
}); });
await window.Signal.Data.updateConversation(conversation.attributes); window.Signal.Data.updateConversation(conversation.attributes);
await window.textsecure.storage.protocol.removeSenderKey(
address,
distributionId
);
} }
function getAccessKey( function getAccessKey(
@ -1094,7 +1092,7 @@ async function fetchKeysForIdentifier(
emptyConversation.set({ emptyConversation.set({
sealedSender: SEALED_SENDER.DISABLED, sealedSender: SEALED_SENDER.DISABLED,
}); });
await window.Signal.Data.updateConversation(emptyConversation.attributes); window.Signal.Data.updateConversation(emptyConversation.attributes);
} }
} catch (error) { } catch (error) {
if (error.name === 'UnregisteredUserError') { if (error.name === 'UnregisteredUserError') {