keejef
/
session-ios
mirror of https://github.com/oxen-io/session-ios
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Don’t add blocked users to new groups and handle block alert results correctly.

Browse Source 
// FREEBIE
pull/1/head
Matthew Chen 8 years ago
parent 5a69917cfd
commit 0ff3e5e6a3
3 changed files with 65 additions and 33 deletions
Show Stats Download Patch File Download Diff File

4
Signal/src/ViewControllers/AddToGroupViewController.m
Unescape Escape View File

@ -57,7 +57,7 @@ NS_ASSUME_NONNULL_BEGIN
blockingManager:helper.blockingManager blockingManager:helper.blockingManager
contactsManager:helper.contactsManager contactsManager:helper.contactsManager
completionBlock:^(BOOL isBlocked) { completionBlock:^(BOOL isBlocked) {
if (isBlocked) { if (!isBlocked) {
[weakSelf addToGroup:phoneNumber]; [weakSelf addToGroup:phoneNumber];
} }
}]; }];
@ -89,7 +89,7 @@ NS_ASSUME_NONNULL_BEGIN
blockingManager:helper.blockingManager blockingManager:helper.blockingManager
contactsManager:helper.contactsManager contactsManager:helper.contactsManager
completionBlock:^(BOOL isBlocked) { completionBlock:^(BOOL isBlocked) {
if (isBlocked) { if (!isBlocked) {
[weakSelf addToGroup:signalAccount.recipientId]; [weakSelf addToGroup:signalAccount.recipientId];
} }
}]; }];

90
Signal/src/ViewControllers/NewGroupViewController.m
Unescape Escape View File

@ -4,6 +4,7 @@
#import "NewGroupViewController.h" #import "NewGroupViewController.h"
#import "AddToGroupViewController.h" #import "AddToGroupViewController.h"
#import "BlockListUIUtils.h"
#import "ContactTableViewCell.h" #import "ContactTableViewCell.h"
#import "ContactsViewHelper.h" #import "ContactsViewHelper.h"
#import "Environment.h" #import "Environment.h"
@ -205,37 +206,56 @@ NS_ASSUME_NONNULL_BEGIN
for (NSString *recipientId in for (NSString *recipientId in
[nonContactMemberRecipientIds.allObjects sortedArrayUsingSelector:@selector(compare:)]) { [nonContactMemberRecipientIds.allObjects sortedArrayUsingSelector:@selector(compare:)]) {
[nonContactsSection addItem:[OWSTableItem itemWithCustomCellBlock:^{ [nonContactsSection
NewGroupViewController *strongSelf = weakSelf; addItem:[OWSTableItem itemWithCustomCellBlock:^{
OWSAssert(strongSelf); NewGroupViewController *strongSelf = weakSelf;
OWSAssert(strongSelf);
ContactTableViewCell *cell = [ContactTableViewCell new];
SignalAccount *signalAccount = [contactsViewHelper signalAccountForRecipientId:recipientId];
BOOL isCurrentMember = [strongSelf.memberRecipientIds containsObject:recipientId];
BOOL isBlocked = [contactsViewHelper isRecipientIdBlocked:recipientId];
if (isCurrentMember) {
// In the "contacts" section, we label members as such when editing an existing group.
cell.accessoryMessage = NSLocalizedString(
@"NEW_GROUP_MEMBER_LABEL", @"An indicator that a user is a member of the new group.");
} else if (isBlocked) {
cell.accessoryMessage = NSLocalizedString(
@"CONTACT_CELL_IS_BLOCKED", @"An indicator that a contact has been blocked.");
} else {
OWSAssert(cell.accessoryMessage == nil);
}
if (signalAccount) { ContactTableViewCell *cell = [ContactTableViewCell new];
[cell configureWithSignalAccount:signalAccount contactsManager:contactsViewHelper.contactsManager]; SignalAccount *signalAccount = [contactsViewHelper signalAccountForRecipientId:recipientId];
} else { BOOL isCurrentMember = [strongSelf.memberRecipientIds containsObject:recipientId];
[cell configureWithRecipientId:recipientId contactsManager:contactsViewHelper.contactsManager]; BOOL isBlocked = [contactsViewHelper isRecipientIdBlocked:recipientId];
} if (isCurrentMember) {
// In the "contacts" section, we label members as such when editing an existing group.
cell.accessoryMessage = NSLocalizedString(
@"NEW_GROUP_MEMBER_LABEL", @"An indicator that a user is a member of the new group.");
} else if (isBlocked) {
cell.accessoryMessage = NSLocalizedString(
@"CONTACT_CELL_IS_BLOCKED", @"An indicator that a contact has been blocked.");
} else {
OWSAssert(cell.accessoryMessage == nil);
}
if (signalAccount) {
[cell configureWithSignalAccount:signalAccount
contactsManager:contactsViewHelper.contactsManager];
} else {
[cell configureWithRecipientId:recipientId contactsManager:contactsViewHelper.contactsManager];
}
return cell; return cell;
} }
customRowHeight:[ContactTableViewCell rowHeight] customRowHeight:[ContactTableViewCell rowHeight]
actionBlock:^{ actionBlock:^{
[weakSelf removeRecipientId:recipientId]; BOOL isCurrentMember = [weakSelf.memberRecipientIds containsObject:recipientId];
}]]; BOOL isBlocked = [contactsViewHelper isRecipientIdBlocked:recipientId];
if (isCurrentMember) {
[weakSelf removeRecipientId:recipientId];
} else if (isBlocked) {
[BlockListUIUtils
showUnblockPhoneNumberActionSheet:recipientId
fromViewController:weakSelf
blockingManager:contactsViewHelper.blockingManager
contactsManager:contactsViewHelper.contactsManager
completionBlock:^(BOOL isStillBlocked) {
if (!isStillBlocked) {
[weakSelf addRecipientId:recipientId];
}
}];
} else {
[weakSelf addRecipientId:recipientId];
}
}]];
} }
[contents addSection:nonContactsSection]; [contents addSection:nonContactsSection];
} }
@ -287,8 +307,20 @@ NS_ASSUME_NONNULL_BEGIN
actionBlock:^{ actionBlock:^{
NSString *recipientId = signalAccount.recipientId; NSString *recipientId = signalAccount.recipientId;
BOOL isCurrentMember = [weakSelf.memberRecipientIds containsObject:recipientId]; BOOL isCurrentMember = [weakSelf.memberRecipientIds containsObject:recipientId];
BOOL isBlocked = [contactsViewHelper isRecipientIdBlocked:recipientId];
if (isCurrentMember) { if (isCurrentMember) {
[weakSelf removeRecipientId:recipientId]; [weakSelf removeRecipientId:recipientId];
} else if (isBlocked) {
[BlockListUIUtils
showUnblockSignalAccountActionSheet:signalAccount
fromViewController:weakSelf
blockingManager:contactsViewHelper.blockingManager
contactsManager:contactsViewHelper.contactsManager
completionBlock:^(BOOL isStillBlocked) {
if (!isStillBlocked) {
[weakSelf addRecipientId:recipientId];
}
}];
} else { } else {
[weakSelf addRecipientId:recipientId]; [weakSelf addRecipientId:recipientId];
} }

4
Signal/src/ViewControllers/NewNonContactConversationViewController.m
Unescape Escape View File

@ -58,7 +58,7 @@ NS_ASSUME_NONNULL_BEGIN
blockingManager:helper.blockingManager blockingManager:helper.blockingManager
contactsManager:helper.contactsManager contactsManager:helper.contactsManager
completionBlock:^(BOOL isBlocked) { completionBlock:^(BOOL isBlocked) {
if (isBlocked) { if (!isBlocked) {
[weakSelf selectRecipient:phoneNumber]; [weakSelf selectRecipient:phoneNumber];
} }
}]; }];
@ -79,7 +79,7 @@ NS_ASSUME_NONNULL_BEGIN
blockingManager:helper.blockingManager blockingManager:helper.blockingManager
contactsManager:helper.contactsManager contactsManager:helper.contactsManager
completionBlock:^(BOOL isBlocked) { completionBlock:^(BOOL isBlocked) {
if (isBlocked) { if (!isBlocked) {
[weakSelf selectRecipient:signalAccount.recipientId]; [weakSelf selectRecipient:signalAccount.recipientId];
} }
}]; }];

Write Preview
Loading…
Cancel
Save