Merge branch 'charlesmchen/contactSharePreviews'

7 years ago · f2cc8cf9d2
parent 424bcbf83e 00eadd629f
commit f2cc8cf9d2
1 changed files with 5 additions and 2 deletions
--- a/SignalServiceKit/src/Messages/Interactions/TSMessage.m
+++ b/SignalServiceKit/src/Messages/Interactions/TSMessage.m
@ -262,8 +262,11 @@ static const NSUInteger OWSMessageSchemaVersion = 4;
    } else if (attachmentDescription.length > 0) {
        return attachmentDescription;
    } else if (self.contactShare) {
-        // TODO: Include properly formatted name.
-        return @"👤";
+        if (CurrentAppContext().isRTL) {
+            return [self.contactShare.displayName stringByAppendingString:@" 👤"];
+        } else {
+            return [@"👤 " stringByAppendingString:self.contactShare.displayName];
+        }
    } else {
        OWSFail(@"%@ message has neither body nor attachment.", self.logTag);
        // TODO: We should do better here.