signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Merge branch 'mkirk/fix-date-formatting-crash'

Browse Source
This commit is contained in:
Michael Kirk 2018-02-21 16:35:12 -05:00
commit c0d1126394
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Signal/src/ViewControllers/InboxTableViewCell.m
View File

@ -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