From 7040437ca627f198c2b41a63bf5109eb5832061a Mon Sep 17 00:00:00 2001 From: Michael Kirk <michael.code@endoftheworl.de> Date: Wed, 21 Feb 2018 11:18:58 -0500 Subject: [PATCH] Handle nil date when formatting // FREEBIE --- Signal/src/ViewControllers/InboxTableViewCell.m | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Signal/src/ViewControllers/InboxTableViewCell.m b/Signal/src/ViewControllers/InboxTableViewCell.m index cabb2e3ca..ed7fa9617 100644 --- a/Signal/src/ViewControllers/InboxTableViewCell.m +++ b/Signal/src/ViewControllers/InboxTableViewCell.m @@ -254,7 +254,13 @@ const NSUInteger kAvatarViewDiameter = 52; #pragma mark - Date formatting -- (NSAttributedString *)dateAttributedString:(NSDate *)date { +- (NSAttributedString *)dateAttributedString:(nullable NSDate *)date +{ + if (date == nil) { + OWSProdLogAndFail(@"%@ date was unexpectedly nil", self.logTag); + return [NSAttributedString new]; + } + NSString *timeString; if ([DateUtil dateIsToday:date]) { @@ -263,6 +269,7 @@ const NSUInteger kAvatarViewDiameter = 52; timeString = [[DateUtil dateFormatter] stringFromDate:date]; } + OWSAssert(timeString); NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithString:timeString]; [attributedString addAttribute:NSForegroundColorAttributeName