From 7fc73e2ba1d63bd903d4e6f134c8eadf48d87aa2 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Thu, 8 Jun 2017 10:31:10 -0400 Subject: [PATCH] include recipient name in error message // FREEBIE --- src/Messages/OWSMessageSender.m | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Messages/OWSMessageSender.m b/src/Messages/OWSMessageSender.m index 01c3e754e..c68e1ab96 100644 --- a/src/Messages/OWSMessageSender.m +++ b/src/Messages/OWSMessageSender.m @@ -864,9 +864,14 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; // If it's happening a lot, we should rethink our profile fetching strategy. OWSAnalyticsInfo(@"Message send failed due to untrusted key."); - NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeUntrustedIdentityKey, - NSLocalizedString(@"FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_KEY", - @"action sheet header when re-sending message which failed because of untrusted identity keys")); + NSString *localizedErrorDescriptionFormat + = NSLocalizedString(@"FAILED_SENDING_BECAUSE_UNTRUSTED_IDENTITY_KEY", + @"action sheet header when re-sending message which failed because of untrusted identity keys"); + + NSString *localizedErrorDescription = + [NSString stringWithFormat:localizedErrorDescriptionFormat, + [self.contactsManager displayNameForPhoneIdentifier:recipient.recipientId]]; + NSError *error = OWSErrorWithCodeDescription(OWSErrorCodeUntrustedIdentityKey, localizedErrorDescription); // Key will continue to be unaccepted, so no need to retry. It'll only cause us to hit the Pre-Key request // rate limit