oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up timer animation.

This commit is contained in:
Matthew Chen 2018-07-27 12:58:05 -04:00
parent 2fe6193708
commit 1b01e8f65f
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Signal/src/ViewControllers/ConversationView/Cells/OWSMessageTimerView.m
View File

@ -82,7 +82,9 @@ const CGFloat kDisappearingMessageIconSize = 12.f;
return;
}
CGFloat secondsLeft = MAX(0, (self.expirationTimestamp - [NSDate ows_millisecondTimeStamp]) / 1000.f);
uint64_t nowTimestamp = [NSDate ows_millisecondTimeStamp];
CGFloat secondsLeft
= (self.expirationTimestamp > nowTimestamp ? (self.expirationTimestamp - nowTimestamp) / 1000.f : 0.f);
CGFloat progress = 0.f;
if (self.initialDurationSeconds > 0) {
progress = CGFloatClamp(secondsLeft / self.initialDurationSeconds, 0.f, 1.f);