colin/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

Browse Source
This commit is contained in:
Scott Nonnenberg
2022-09-01 11:26:10 -07:00
committed by GitHub
parent a48ea4ab76
commit 8bbd892693
1 changed files with 7 additions and 11 deletions
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. // 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'; source: window.ConversationController.getOurConversationId(),
if (isValidExpireTimer) { receivedAt: receivedAtCounter,
await conversation.updateExpirationTimer(expireTimer, { fromSync: true,
source: window.ConversationController.getOurConversationId(), isInitialSync,
receivedAt: receivedAtCounter, reason: 'contact sync',
fromSync: true, });
isInitialSync,
reason: 'contact sync',
});
}
window.Whisper.events.trigger('incrementProgress'); window.Whisper.events.trigger('incrementProgress');
} }