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

17
ts/models/conversations.ts
View file

@ -2615,8 +2615,6 @@ export class ConversationModel extends window.Backbone
const options = providedOptions || {};
window._.defaults(options, {
viaStorageServiceSync: false,
viaSyncMessage: false,
viaContactSync: false,
key: null,
});
@ -2633,7 +2631,7 @@ export class ConversationModel extends window.Backbone
const uuid = this.getUuid();
const beginningVerified = this.get('verified');
let keyChange = false;
if (options.viaSyncMessage || options.viaStorageServiceSync) {
if (options.viaStorageServiceSync) {
strictAssert(
uuid,
`Sync message didn't update uuid for conversation: ${this.id}`
@ -2670,27 +2668,26 @@ export class ConversationModel extends window.Backbone
}
const didSomethingChange = keyChange || beginningVerified !== verified;
const isExplicitUserAction =
!options.viaContactSync && !options.viaStorageServiceSync;
const shouldShowFromContactSync =
options.viaContactSync && verified !== UNVERIFIED;
const isExplicitUserAction = !options.viaStorageServiceSync;
const shouldShowFromStorageSync =
options.viaStorageServiceSync && verified !== UNVERIFIED;
if (
// The message came from an explicit verification in a client (not a contact sync
// or storage service sync)
(didSomethingChange && isExplicitUserAction) ||
// The verification value received by the contact sync is different from what we
// have on record (and it's not a transition to UNVERIFIED)
(didSomethingChange && shouldShowFromContactSync) ||
(didSomethingChange && shouldShowFromStorageSync) ||
// Our local verification status is VERIFIED and it hasn't changed, but the key did
// change (Key1/VERIFIED -> Key2/VERIFIED), but we don't want to show DEFAULT ->
// DEFAULT or UNVERIFIED -> UNVERIFIED
(keyChange && verified === VERIFIED)
) {
await this.addVerifiedChange(this.id, verified === VERIFIED, {
local: !options.viaSyncMessage,
local: isExplicitUserAction,
});
}
if (!options.viaSyncMessage && uuid) {
if (isExplicitUserAction && uuid) {
await this.sendVerifySyncMessage(this.get('e164'), uuid, verified);
}