Don’t let user block themselves.

// FREEBIE
This commit is contained in:
Matthew Chen 2017-04-07 11:44:26 -04:00
parent 372d6b9bfd
commit 4cd1684ded
1 changed files with 20 additions and 17 deletions

View File

@ -73,6 +73,26 @@ typedef void (^BlockAlertCompletionBlock)();
OWSAssert(fromViewController);
OWSAssert(blockingManager);
NSString *localContactId = [TSAccountManager localNumber];
OWSAssert(localContactId.length > 0);
for (NSString *phoneNumber in phoneNumbers) {
OWSAssert(phoneNumber.length > 0);
if ([localContactId isEqualToString:phoneNumber]) {
[self showOkAlertWithTitle:NSLocalizedString(@"BLOCK_LIST_VIEW_CANT_BLOCK_SELF_ALERT_TITLE",
@"The title of the 'You can't block yourself' alert.")
message:NSLocalizedString(@"BLOCK_LIST_VIEW_CANT_BLOCK_SELF_ALERT_MESSAGE",
@"The title of the 'You can't block yourself' alert.")
fromViewController:fromViewController
completionBlock:^{
if (completionBlock) {
completionBlock(NO);
}
}];
return;
}
}
NSString *title = [NSString stringWithFormat:NSLocalizedString(@"BLOCK_LIST_BLOCK_TITLE_FORMAT",
@"A format for the 'block user' action sheet title. Embeds {{the "
@"blocked user's name or phone number}}."),
@ -120,25 +140,8 @@ typedef void (^BlockAlertCompletionBlock)();
OWSAssert(fromViewController);
OWSAssert(blockingManager);
NSString *localContactId = [TSAccountManager localNumber];
OWSAssert(localContactId.length > 0);
for (NSString *phoneNumber in phoneNumbers) {
OWSAssert(phoneNumber.length > 0);
if ([localContactId isEqualToString:phoneNumber]) {
[self showOkAlertWithTitle:NSLocalizedString(@"BLOCK_LIST_VIEW_CANT_BLOCK_SELF_ALERT_TITLE",
@"The title of the 'You can't block yourself' alert.")
message:NSLocalizedString(@"BLOCK_LIST_VIEW_CANT_BLOCK_SELF_ALERT_MESSAGE",
@"The title of the 'You can't block yourself' alert.")
fromViewController:fromViewController
completionBlock:^{
if (completionBlock) {
completionBlock(NO);
}
}];
return;
}
[blockingManager addBlockedPhoneNumber:phoneNumber];
}