|
|
|
|
@ -170,7 +170,7 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
|
[findByPhoneSection
|
|
|
|
|
addItem:[OWSTableItem disclosureItemWithText:NSLocalizedString(@"NEW_CONVERSATION_FIND_BY_PHONE_NUMBER",
|
|
|
|
|
@"A label the cell that lets you add a new member to a group.")
|
|
|
|
|
customRowHeight:[ContactTableViewCell rowHeight]
|
|
|
|
|
customRowHeight:UITableViewAutomaticDimension
|
|
|
|
|
actionBlock:^{
|
|
|
|
|
NewNonContactConversationViewController *viewController =
|
|
|
|
|
[NewNonContactConversationViewController new];
|
|
|
|
|
@ -186,74 +186,77 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
|
recentChatsSection.headerTitle = NSLocalizedString(
|
|
|
|
|
@"SELECT_THREAD_TABLE_RECENT_CHATS_TITLE", @"Table section header for recently active conversations");
|
|
|
|
|
for (TSThread *thread in [self filteredThreadsWithSearchText]) {
|
|
|
|
|
[recentChatsSection addItem:[OWSTableItem itemWithCustomCellBlock:^{
|
|
|
|
|
SelectThreadViewController *strongSelf = weakSelf;
|
|
|
|
|
OWSCAssert(strongSelf);
|
|
|
|
|
|
|
|
|
|
// To be consistent with the threads (above), we use ContactTableViewCell
|
|
|
|
|
// instead of HomeViewCell to present contacts and threads.
|
|
|
|
|
ContactTableViewCell *cell = [ContactTableViewCell new];
|
|
|
|
|
|
|
|
|
|
if ([thread isKindOfClass:[TSContactThread class]]) {
|
|
|
|
|
BOOL isBlocked = [helper isRecipientIdBlocked:thread.contactIdentifier];
|
|
|
|
|
if (isBlocked) {
|
|
|
|
|
cell.accessoryMessage = NSLocalizedString(@"CONTACT_CELL_IS_BLOCKED", @"An indicator that a contact has been blocked.");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[cell configureWithThread:thread contactsManager:helper.contactsManager];
|
|
|
|
|
|
|
|
|
|
if (cell.accessoryView == nil) {
|
|
|
|
|
// Don't add a disappearing messages indicator if we've already added a "blocked" label.
|
|
|
|
|
__block OWSDisappearingMessagesConfiguration *disappearingMessagesConfiguration;
|
|
|
|
|
[self.uiDatabaseConnection readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
|
|
|
|
|
disappearingMessagesConfiguration =
|
|
|
|
|
[OWSDisappearingMessagesConfiguration fetchObjectWithUniqueID:thread.uniqueId
|
|
|
|
|
transaction:transaction];
|
|
|
|
|
}];
|
|
|
|
|
|
|
|
|
|
if (disappearingMessagesConfiguration && disappearingMessagesConfiguration.isEnabled) {
|
|
|
|
|
DisappearingTimerConfigurationView *disappearingTimerConfigurationView =
|
|
|
|
|
[[DisappearingTimerConfigurationView alloc]
|
|
|
|
|
initWithDurationSeconds:disappearingMessagesConfiguration.durationSeconds];
|
|
|
|
|
|
|
|
|
|
disappearingTimerConfigurationView.frame = CGRectMake(0, 0, 44, 44);
|
|
|
|
|
disappearingTimerConfigurationView.tintColor = [UIColor colorWithWhite:0.5f alpha:1.f];
|
|
|
|
|
|
|
|
|
|
cell.accessoryView = disappearingTimerConfigurationView;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return cell;
|
|
|
|
|
}
|
|
|
|
|
customRowHeight:[ContactTableViewCell rowHeight]
|
|
|
|
|
actionBlock:^{
|
|
|
|
|
typeof(self) strongSelf = weakSelf;
|
|
|
|
|
if (!strongSelf) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ([thread isKindOfClass:[TSContactThread class]]) {
|
|
|
|
|
BOOL isBlocked = [helper isRecipientIdBlocked:thread.contactIdentifier];
|
|
|
|
|
if (isBlocked
|
|
|
|
|
&& ![strongSelf.selectThreadViewDelegate canSelectBlockedContact]) {
|
|
|
|
|
[BlockListUIUtils
|
|
|
|
|
showUnblockPhoneNumberActionSheet:thread.contactIdentifier
|
|
|
|
|
fromViewController:strongSelf
|
|
|
|
|
blockingManager:helper.blockingManager
|
|
|
|
|
contactsManager:helper.contactsManager
|
|
|
|
|
completionBlock:^(BOOL isStillBlocked) {
|
|
|
|
|
if (!isStillBlocked) {
|
|
|
|
|
[strongSelf.selectThreadViewDelegate
|
|
|
|
|
threadWasSelected:thread];
|
|
|
|
|
}
|
|
|
|
|
}];
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[strongSelf.selectThreadViewDelegate threadWasSelected:thread];
|
|
|
|
|
}]];
|
|
|
|
|
[recentChatsSection
|
|
|
|
|
addItem:[OWSTableItem
|
|
|
|
|
itemWithCustomCellBlock:^{
|
|
|
|
|
SelectThreadViewController *strongSelf = weakSelf;
|
|
|
|
|
OWSCAssert(strongSelf);
|
|
|
|
|
|
|
|
|
|
// To be consistent with the threads (above), we use ContactTableViewCell
|
|
|
|
|
// instead of HomeViewCell to present contacts and threads.
|
|
|
|
|
ContactTableViewCell *cell = [ContactTableViewCell new];
|
|
|
|
|
|
|
|
|
|
if ([thread isKindOfClass:[TSContactThread class]]) {
|
|
|
|
|
BOOL isBlocked = [helper isRecipientIdBlocked:thread.contactIdentifier];
|
|
|
|
|
if (isBlocked) {
|
|
|
|
|
cell.accessoryMessage = NSLocalizedString(
|
|
|
|
|
@"CONTACT_CELL_IS_BLOCKED", @"An indicator that a contact has been blocked.");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[cell configureWithThread:thread contactsManager:helper.contactsManager];
|
|
|
|
|
|
|
|
|
|
if (cell.accessoryView == nil) {
|
|
|
|
|
// Don't add a disappearing messages indicator if we've already added a "blocked" label.
|
|
|
|
|
__block OWSDisappearingMessagesConfiguration *disappearingMessagesConfiguration;
|
|
|
|
|
[self.uiDatabaseConnection
|
|
|
|
|
readWithBlock:^(YapDatabaseReadTransaction *_Nonnull transaction) {
|
|
|
|
|
disappearingMessagesConfiguration = [OWSDisappearingMessagesConfiguration
|
|
|
|
|
fetchObjectWithUniqueID:thread.uniqueId
|
|
|
|
|
transaction:transaction];
|
|
|
|
|
}];
|
|
|
|
|
|
|
|
|
|
if (disappearingMessagesConfiguration && disappearingMessagesConfiguration.isEnabled) {
|
|
|
|
|
DisappearingTimerConfigurationView *disappearingTimerConfigurationView =
|
|
|
|
|
[[DisappearingTimerConfigurationView alloc]
|
|
|
|
|
initWithDurationSeconds:disappearingMessagesConfiguration.durationSeconds];
|
|
|
|
|
|
|
|
|
|
disappearingTimerConfigurationView.frame = CGRectMake(0, 0, 44, 44);
|
|
|
|
|
disappearingTimerConfigurationView.tintColor =
|
|
|
|
|
[UIColor colorWithWhite:0.5f alpha:1.f];
|
|
|
|
|
|
|
|
|
|
cell.accessoryView = disappearingTimerConfigurationView;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return cell;
|
|
|
|
|
}
|
|
|
|
|
customRowHeight:UITableViewAutomaticDimension
|
|
|
|
|
actionBlock:^{
|
|
|
|
|
typeof(self) strongSelf = weakSelf;
|
|
|
|
|
if (!strongSelf) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if ([thread isKindOfClass:[TSContactThread class]]) {
|
|
|
|
|
BOOL isBlocked = [helper isRecipientIdBlocked:thread.contactIdentifier];
|
|
|
|
|
if (isBlocked && ![strongSelf.selectThreadViewDelegate canSelectBlockedContact]) {
|
|
|
|
|
[BlockListUIUtils showUnblockPhoneNumberActionSheet:thread.contactIdentifier
|
|
|
|
|
fromViewController:strongSelf
|
|
|
|
|
blockingManager:helper.blockingManager
|
|
|
|
|
contactsManager:helper.contactsManager
|
|
|
|
|
completionBlock:^(BOOL isStillBlocked) {
|
|
|
|
|
if (!isStillBlocked) {
|
|
|
|
|
[strongSelf.selectThreadViewDelegate
|
|
|
|
|
threadWasSelected:thread];
|
|
|
|
|
}
|
|
|
|
|
}];
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
[strongSelf.selectThreadViewDelegate threadWasSelected:thread];
|
|
|
|
|
}]];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (recentChatsSection.itemCount > 0) {
|
|
|
|
|
@ -266,25 +269,27 @@ NS_ASSUME_NONNULL_BEGIN
|
|
|
|
|
@"SELECT_THREAD_TABLE_OTHER_CHATS_TITLE", @"Table section header for conversations you haven't recently used.");
|
|
|
|
|
NSArray<SignalAccount *> *filteredSignalAccounts = [self filteredSignalAccountsWithSearchText];
|
|
|
|
|
for (SignalAccount *signalAccount in filteredSignalAccounts) {
|
|
|
|
|
[otherContactsSection addItem:[OWSTableItem itemWithCustomCellBlock:^{
|
|
|
|
|
SelectThreadViewController *strongSelf = weakSelf;
|
|
|
|
|
OWSCAssert(strongSelf);
|
|
|
|
|
|
|
|
|
|
ContactTableViewCell *cell = [ContactTableViewCell new];
|
|
|
|
|
BOOL isBlocked = [helper isRecipientIdBlocked:signalAccount.recipientId];
|
|
|
|
|
if (isBlocked) {
|
|
|
|
|
cell.accessoryMessage
|
|
|
|
|
= NSLocalizedString(@"CONTACT_CELL_IS_BLOCKED", @"An indicator that a contact has been blocked.");
|
|
|
|
|
} else {
|
|
|
|
|
OWSAssert(cell.accessoryMessage == nil);
|
|
|
|
|
}
|
|
|
|
|
[cell configureWithSignalAccount:signalAccount contactsManager:helper.contactsManager];
|
|
|
|
|
return cell;
|
|
|
|
|
}
|
|
|
|
|
customRowHeight:[ContactTableViewCell rowHeight]
|
|
|
|
|
actionBlock:^{
|
|
|
|
|
[weakSelf signalAccountWasSelected:signalAccount];
|
|
|
|
|
}]];
|
|
|
|
|
[otherContactsSection
|
|
|
|
|
addItem:[OWSTableItem
|
|
|
|
|
itemWithCustomCellBlock:^{
|
|
|
|
|
SelectThreadViewController *strongSelf = weakSelf;
|
|
|
|
|
OWSCAssert(strongSelf);
|
|
|
|
|
|
|
|
|
|
ContactTableViewCell *cell = [ContactTableViewCell new];
|
|
|
|
|
BOOL isBlocked = [helper isRecipientIdBlocked:signalAccount.recipientId];
|
|
|
|
|
if (isBlocked) {
|
|
|
|
|
cell.accessoryMessage = NSLocalizedString(
|
|
|
|
|
@"CONTACT_CELL_IS_BLOCKED", @"An indicator that a contact has been blocked.");
|
|
|
|
|
} else {
|
|
|
|
|
OWSAssert(cell.accessoryMessage == nil);
|
|
|
|
|
}
|
|
|
|
|
[cell configureWithSignalAccount:signalAccount contactsManager:helper.contactsManager];
|
|
|
|
|
return cell;
|
|
|
|
|
}
|
|
|
|
|
customRowHeight:UITableViewAutomaticDimension
|
|
|
|
|
actionBlock:^{
|
|
|
|
|
[weakSelf signalAccountWasSelected:signalAccount];
|
|
|
|
|
}]];
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (otherContactsSection.itemCount > 0) {
|
|
|
|
|
|
Matthew Chen
7 years ago