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

Drop verified syncs, use storage service for event

Browse source
This commit is contained in:
Fedor Indutny 2022-04-20 16:41:52 -07:00 • committed by GitHub
parent 8c4b875dca
commit da45f26d37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

76
ts/background.ts
View file

@ -84,7 +84,6 @@ import type {
SentEventData,
StickerPackEvent,
TypingEvent,
VerifiedEvent,
ViewEvent,
ViewOnceOpenSyncEvent,
ViewSyncEvent,
@ -327,10 +326,6 @@ export async function startApp(): Promise<void> {
'view',
queuedEventListener(onViewReceipt)
);
messageReceiver.addEventListener(
'verified',
queuedEventListener(onVerified)
);
messageReceiver.addEventListener(
'error',
queuedEventListener(onError, false)
@ -3716,77 +3711,6 @@ export async function startApp(): Promise<void> {
return ViewSyncs.getSingleton().onSync(receipt);
}
async function onVerified(ev: VerifiedEvent) {
const e164 = ev.verified.destination;
const uuid = ev.verified.destinationUuid;
const key = ev.verified.identityKey;
let state;
if (ev.confirm) {
ev.confirm();
}
const c = new window.Whisper.Conversation({
e164,
uuid,
type: 'private',
} as Partial<ConversationAttributesType> as WhatIsThis);
const error = c.validate();
if (error) {
log.error(
'Invalid verified sync received:',
e164,
uuid,
Errors.toLogFormat(error)
);
return;
}
switch (ev.verified.state) {
case Proto.Verified.State.DEFAULT:
state = 'DEFAULT';
break;
case Proto.Verified.State.VERIFIED:
state = 'VERIFIED';
break;
case Proto.Verified.State.UNVERIFIED:
state = 'UNVERIFIED';
break;
default:
log.error(`Got unexpected verified state: ${ev.verified.state}`);
}
log.info(
'got verified sync for',
e164,
uuid,
state,
ev.verified.viaContactSync ? 'via contact sync' : ''
);
const verifiedId = window.ConversationController.ensureContactIds({
e164,
uuid,
highTrust: true,
reason: 'onVerified',
});
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const contact = window.ConversationController.get(verifiedId)!;
const options = {
viaSyncMessage: true,
viaContactSync: ev.verified.viaContactSync,
key,
};
if (state === 'VERIFIED') {
await contact.setVerified(options);
} else if (state === 'DEFAULT') {
await contact.setVerifiedDefault(options);
} else {
await contact.setUnverified(options);
}
}
function onDeliveryReceipt(ev: DeliveryEvent) {
const { deliveryReceipt } = ev;
const { envelopeTimestamp, sourceUuid, source, sourceDevice, timestamp } =