Handle contact: don't exit early if timer is 'invalid'

This commit is contained in:
Scott Nonnenberg 2018-08-15 11:20:53 -07:00
parent 621883a0ce
commit 0eb2c958a5
2 changed files with 14 additions and 17 deletions

View file

@ -860,20 +860,18 @@
);
const { expireTimer } = details;
const isValidExpireTimer = typeof expireTimer === 'number';
if (!isValidExpireTimer) {
return;
if (isValidExpireTimer) {
const source = textsecure.storage.user.getNumber();
const receivedAt = Date.now();
await conversation.updateExpirationTimer(
expireTimer,
source,
receivedAt,
{ fromSync: true }
);
}
const source = textsecure.storage.user.getNumber();
const receivedAt = Date.now();
await conversation.updateExpirationTimer(
expireTimer,
source,
receivedAt,
{ fromSync: true }
);
if (details.verified) {
const { verified } = details;
const verifiedEvent = new Event('verified');
@ -885,8 +883,6 @@
verifiedEvent.viaContactSync = true;
await onVerified(verifiedEvent);
}
ev.confirm();
} catch (error) {
window.log.error('onContactReceived error:', Errors.toLogFormat(error));
}