From 8bbd892693a14dc1359967bda1d9baf9c6f34d2e Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Thu, 1 Sep 2022 11:26:10 -0700
Subject: [PATCH] Contact Sync: Consider undefined value as a disabled expire
 timer

---
 ts/services/contactSync.ts | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/ts/services/contactSync.ts b/ts/services/contactSync.ts
index 2669462d4..abf136cb0 100644
--- a/ts/services/contactSync.ts
+++ b/ts/services/contactSync.ts
@@ -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');
 }