From 32f33f6d126856502c5e2d6150877c35258877ca Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Fri, 29 Jun 2018 09:27:10 -0400
Subject: [PATCH] Tweak sender names.

---
 .../ConversationView/Cells/OWSMessageBubbleView.m             | 4 ++--
 .../ConversationView/ConversationViewController.m             | 2 +-
 SignalMessaging/contacts/OWSContactsManager.h                 | 2 +-
 SignalMessaging/contacts/OWSContactsManager.m                 | 3 +--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index d3169abb3..93ecbd056 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -683,9 +683,9 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert(self.senderNameLabel);
     OWSAssert(self.shouldShowSenderName);
 
-    self.senderNameLabel.text = self.viewItem.senderName.uppercaseString;
-    self.senderNameLabel.textColor = self.bodyTextColor;
+    self.senderNameLabel.text = self.viewItem.senderName;
     self.senderNameLabel.font = UIFont.ows_dynamicTypeCaption2Font;
+    self.senderNameLabel.textColor = self.bodyTextColor;
     self.senderNameLabel.lineBreakMode = NSLineBreakByTruncatingTail;
 }
 
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 0ba61c8ff..bba4740c0 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -4910,7 +4910,7 @@ typedef enum : NSUInteger {
                             || viewItem.shouldShowDate);
                 }
                 if (shouldShowSenderName) {
-                    senderName = [self.contactsManager displayNameForPhoneIdentifier:incomingSenderId];
+                    senderName = [self.contactsManager contactOrProfileNameForPhoneIdentifier:incomingSenderId];
                 }
 
                 // Show the sender avatar for incoming group messages unless
diff --git a/SignalMessaging/contacts/OWSContactsManager.h b/SignalMessaging/contacts/OWSContactsManager.h
index 6df58f7c0..3dee348d5 100644
--- a/SignalMessaging/contacts/OWSContactsManager.h
+++ b/SignalMessaging/contacts/OWSContactsManager.h
@@ -86,7 +86,7 @@ extern NSString *const OWSContactsManagerSignalAccountsDidChangeNotification;
 - (nullable NSData *)profileImageDataForPhoneIdentifier:(nullable NSString *)identifier;
 
 - (nullable UIImage *)imageForPhoneIdentifier:(nullable NSString *)identifier;
-- (NSAttributedString *)formattedDisplayNameForSignalAccount:(SignalAccount *)signalAccount font:(UIFont *_Nonnull)font;
+- (NSAttributedString *)formattedDisplayNameForSignalAccount:(SignalAccount *)signalAccount font:(UIFont *)font;
 - (NSAttributedString *)formattedFullNameForRecipientId:(NSString *)recipientId font:(UIFont *)font;
 - (NSString *)contactOrProfileNameForPhoneIdentifier:(NSString *)recipientId;
 - (NSAttributedString *)attributedContactOrProfileNameForPhoneIdentifier:(NSString *)recipientId;
diff --git a/SignalMessaging/contacts/OWSContactsManager.m b/SignalMessaging/contacts/OWSContactsManager.m
index ae622e4d5..ad28c4018 100644
--- a/SignalMessaging/contacts/OWSContactsManager.m
+++ b/SignalMessaging/contacts/OWSContactsManager.m
@@ -617,8 +617,7 @@ NSString *const OWSContactsManagerSignalAccountsDidChangeNotification
     return [self displayNameForPhoneIdentifier:signalAccount.recipientId];
 }
 
-- (NSAttributedString *_Nonnull)formattedDisplayNameForSignalAccount:(SignalAccount *)signalAccount
-                                                                font:(UIFont *_Nonnull)font
+- (NSAttributedString *_Nonnull)formattedDisplayNameForSignalAccount:(SignalAccount *)signalAccount font:(UIFont *)font
 {
     OWSAssert(signalAccount);
     OWSAssert(font);