From c1a1ea7f3bd06715c0d3d4e477effd0f054ae21b Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 12 May 2017 16:59:04 -0400 Subject: [PATCH] Let users start new 1:1 conversations with blocked non-contacts found by phone number. // FREEBIE --- .../NewNonContactConversationViewController.m | 32 ++----------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/Signal/src/ViewControllers/NewNonContactConversationViewController.m b/Signal/src/ViewControllers/NewNonContactConversationViewController.m index 118f5fdcd..7a3987727 100644 --- a/Signal/src/ViewControllers/NewNonContactConversationViewController.m +++ b/Signal/src/ViewControllers/NewNonContactConversationViewController.m @@ -50,42 +50,14 @@ NS_ASSUME_NONNULL_BEGIN { OWSAssert(phoneNumber.length > 0); - __weak NewNonContactConversationViewController *weakSelf = self; - ContactsViewHelper *helper = self.contactsViewHelper; - if ([helper isRecipientIdBlocked:phoneNumber]) { - [BlockListUIUtils showUnblockPhoneNumberActionSheet:phoneNumber - fromViewController:self - blockingManager:helper.blockingManager - contactsManager:helper.contactsManager - completionBlock:^(BOOL isBlocked) { - if (!isBlocked) { - [weakSelf selectRecipient:phoneNumber]; - } - }]; - } else { - [self selectRecipient:phoneNumber]; - } + [self selectRecipient:phoneNumber]; } - (void)signalAccountWasSelected:(SignalAccount *)signalAccount { OWSAssert(signalAccount); - __weak NewNonContactConversationViewController *weakSelf = self; - ContactsViewHelper *helper = self.contactsViewHelper; - if ([helper isRecipientIdBlocked:signalAccount.recipientId]) { - [BlockListUIUtils showUnblockSignalAccountActionSheet:signalAccount - fromViewController:self - blockingManager:helper.blockingManager - contactsManager:helper.contactsManager - completionBlock:^(BOOL isBlocked) { - if (!isBlocked) { - [weakSelf selectRecipient:signalAccount.recipientId]; - } - }]; - } else { - [self selectRecipient:signalAccount.recipientId]; - } + [self selectRecipient:signalAccount.recipientId]; } - (void)selectRecipient:(NSString *)recipientId