diff --git a/src/Messages/OWSBlockingManager.m b/src/Messages/OWSBlockingManager.m index 4549eb6fc..7094f56fe 100644 --- a/src/Messages/OWSBlockingManager.m +++ b/src/Messages/OWSBlockingManager.m @@ -167,7 +167,7 @@ NSString *const kOWSBlockingManager_SyncedBlockedPhoneNumbersKey = @"kOWSBlockin if (sendSyncMessage) { [self sendBlockedPhoneNumbersMessage:blockedPhoneNumbers]; } else { - // If this update came from an incoming blocklist sync message, + // If this update came from an incoming block list sync message, // update the "synced blocked phone numbers" state immediately, // since we're now in sync. // diff --git a/src/Messages/OWSMessageSender.m b/src/Messages/OWSMessageSender.m index c03bde00b..ee61b1a06 100644 --- a/src/Messages/OWSMessageSender.m +++ b/src/Messages/OWSMessageSender.m @@ -575,7 +575,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException"; NSArray *blockedPhoneNumbers = _blockingManager.blockedPhoneNumbers; if ([blockedPhoneNumbers containsObject:recipientContactId]) { DDLogInfo(@"%@ skipping 1:1 send to blocked contact: %@", self.tag, recipientContactId); - NSError *error = OWSErrorMakeMessageSendFailedToBlocklistError(); + NSError *error = OWSErrorMakeMessageSendFailedToBlockListError(); // No need to retry - the user will continue to be blocked. failureHandler(error, NO); return; diff --git a/src/Util/OWSError.h b/src/Util/OWSError.h index 22605621e..691093b41 100644 --- a/src/Util/OWSError.h +++ b/src/Util/OWSError.h @@ -22,7 +22,7 @@ typedef NS_ENUM(NSInteger, OWSErrorCode) { OWSErrorCodeUserError = 2001, OWSErrorCodeNoSuchSignalRecipient = 777404, OWSErrorCodeMessageSendDisabledDueToPreKeyUpdateFailures = 777405, - OWSErrorCodeMessageSendFailedToBlocklist = 777406, + OWSErrorCodeMessageSendFailedToBlockList = 777406, }; extern NSError *OWSErrorWithCodeDescription(OWSErrorCode code, NSString *description); @@ -31,6 +31,6 @@ extern NSError *OWSErrorMakeFailedToSendOutgoingMessageError(); extern NSError *OWSErrorMakeNoSuchSignalRecipientError(); extern NSError *OWSErrorMakeAssertionError(); extern NSError *OWSErrorMakeMessageSendDisabledDueToPreKeyUpdateFailuresError(); -extern NSError *OWSErrorMakeMessageSendFailedToBlocklistError(); +extern NSError *OWSErrorMakeMessageSendFailedToBlockListError(); NS_ASSUME_NONNULL_END diff --git a/src/Util/OWSError.m b/src/Util/OWSError.m index cb0bde385..d55523b86 100644 --- a/src/Util/OWSError.m +++ b/src/Util/OWSError.m @@ -47,11 +47,11 @@ NSError *OWSErrorMakeMessageSendDisabledDueToPreKeyUpdateFailuresError() @"Error mesage indicating that message send is disabled due to prekey update failures")); } -NSError *OWSErrorMakeMessageSendFailedToBlocklistError() +NSError *OWSErrorMakeMessageSendFailedToBlockListError() { - return OWSErrorWithCodeDescription(OWSErrorCodeMessageSendFailedToBlocklist, - NSLocalizedString(@"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCKLIST", - @"Error mesage indicating that message send failed due to blocklist")); + return OWSErrorWithCodeDescription(OWSErrorCodeMessageSendFailedToBlockList, + NSLocalizedString(@"ERROR_DESCRIPTION_MESSAGE_SEND_FAILED_DUE_TO_BLOCK_LIST", + @"Error mesage indicating that message send failed due to block list")); } NS_ASSUME_NONNULL_END