Respond to CR.

2018-07-11 11:26:11 -04:00 · 2018-07-11 11:26:11 -04:00 · f426af8167
parent 6d45d533ef
commit f426af8167
1 changed files with 6 additions and 0 deletions
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTimerView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTimerView.m
@ -76,6 +76,12 @@ const CGFloat kDisappearingMessageIconSize = 12.f;

 - (void)updateProgress12
 {
+    BOOL hasStartedCountdown = self.expirationTimestamp > 0;
+    if (!hasStartedCountdown) {
+        self.progress12 = 12;
+        return;
+    }
+
    CGFloat secondsLeft = MAX(0, (self.expirationTimestamp - [NSDate ows_millisecondTimeStamp]) / 1000.f);
    CGFloat progress = 0.f;
    if (self.initialDurationSeconds > 0) {