Merge branch 'charlesmchen/contactSharePreviews'

This commit is contained in:
Matthew Chen 2018-05-02 11:13:41 -04:00
commit f2cc8cf9d2

View file

@ -262,8 +262,11 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
} else if (attachmentDescription.length > 0) { } else if (attachmentDescription.length > 0) {
return attachmentDescription; return attachmentDescription;
} else if (self.contactShare) { } else if (self.contactShare) {
// TODO: Include properly formatted name. if (CurrentAppContext().isRTL) {
return @"👤"; return [self.contactShare.displayName stringByAppendingString:@" 👤"];
} else {
return [@"👤 " stringByAppendingString:self.contactShare.displayName];
}
} else { } else {
OWSFail(@"%@ message has neither body nor attachment.", self.logTag); OWSFail(@"%@ message has neither body nor attachment.", self.logTag);
// TODO: We should do better here. // TODO: We should do better here.