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

Contact Sync: Consider undefined value as a disabled expire timer

Browse source
This commit is contained in:
Scott Nonnenberg 2022-09-01 11:26:10 -07:00 • committed by GitHub
parent a48ea4ab76
commit 8bbd892693
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ts/services/contactSync.ts
View file

@ -60,17 +60,13 @@ async function updateConversationFromContactSync(
} }
// expireTimer isn't in Storage Service so we have to rely on contact sync. // expireTimer isn't in Storage Service so we have to rely on contact sync.
const { expireTimer } = details; await conversation.updateExpirationTimer(details.expireTimer, {
const isValidExpireTimer = typeof expireTimer === 'number';
if (isValidExpireTimer) {
await conversation.updateExpirationTimer(expireTimer, {
source: window.ConversationController.getOurConversationId(), source: window.ConversationController.getOurConversationId(),
receivedAt: receivedAtCounter, receivedAt: receivedAtCounter,
fromSync: true, fromSync: true,
isInitialSync, isInitialSync,
reason: 'contact sync', reason: 'contact sync',
}); });
}
window.Whisper.events.trigger('incrementProgress'); window.Whisper.events.trigger('incrementProgress');
} }