Merge pull request #254 from RyanRory/display-name-in-quote

Show Display Name in Replies
5 years ago · 13d81edb8d
parent 08c1acef51 3bbe8f558d
commit 13d81edb8d
1 changed files with 1 additions and 1 deletions
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
@ -549,7 +549,7 @@ const CGFloat kRemotelySourcedContentRowSpacing = 4;
        }
    } else {
        OWSContactsManager *contactsManager = Environment.shared.contactsManager;
-        __block NSString *quotedAuthor = [contactsManager contactOrProfileNameForPhoneIdentifier:self.quotedMessage.authorId];
+        __block NSString *quotedAuthor = [SSKEnvironment.shared.profileManager profileNameForRecipientWithID:self.quotedMessage.authorId] ?: [contactsManager contactOrProfileNameForPhoneIdentifier:self.quotedMessage.authorId];
        
        if (quotedAuthor == self.quotedMessage.authorId) {
            [OWSPrimaryStorage.sharedManager.dbReadConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {