jonny
/
Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Contact Sync: Consider undefined value as a disabled expire timer 

Co-authored-by: Scott Nonnenberg <scott@signal.org>
This commit is contained in:
automated-signal 2022-09-01 11:43:09 -07:00 committed by GitHub
parent fd45d9b387
commit cf3060e5ea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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.
const { expireTimer } = details;
const isValidExpireTimer = typeof expireTimer === 'number';
if (isValidExpireTimer) {
await conversation.updateExpirationTimer(expireTimer, {
source: window.ConversationController.getOurConversationId(),
receivedAt: receivedAtCounter,
fromSync: true,
isInitialSync,
reason: 'contact sync',
});
}
await conversation.updateExpirationTimer(details.expireTimer, {
source: window.ConversationController.getOurConversationId(),
receivedAt: receivedAtCounter,
fromSync: true,
isInitialSync,
reason: 'contact sync',
});
window.Whisper.events.trigger('incrementProgress');
}