Don't post extraneous verified change notification
Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
This commit is contained in:
parent
9c3cd7f8af
commit
d3bb35568d
|
@ -2667,17 +2667,17 @@ export class ConversationModel extends window.Backbone
|
|||
}
|
||||
}
|
||||
|
||||
const didSomethingChange = keyChange || beginningVerified !== verified;
|
||||
const didVerifiedChange = beginningVerified !== verified;
|
||||
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
|
||||
// The message came from an explicit verification in a client (not
|
||||
// storage service sync)
|
||||
(didVerifiedChange && isExplicitUserAction) ||
|
||||
// The verification value received by the storage sync is different from what we
|
||||
// have on record (and it's not a transition to UNVERIFIED)
|
||||
(didSomethingChange && shouldShowFromStorageSync) ||
|
||||
(didVerifiedChange && 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
|
||||
|
|
Loading…
Reference in New Issue