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

js/background.js

@@ -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));
     }