diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m index 48ac417d3..fa7265bde 100644 --- a/Signal/src/ViewControllers/HomeView/HomeViewController.m +++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m @@ -467,9 +467,32 @@ typedef NS_ENUM(NSInteger, HomeViewControllerSection) { [self updateViewState]; } +- (NSArray *)suggestedAccountsForFirstContact +{ + NSMutableArray *accounts = [NSMutableArray new]; + NSString *_Nullable localNumber = [TSAccountManager localNumber]; + if (localNumber == nil) { + OWSFailDebug(@"localNumber was unexepectedly nil"); + return @[]; + } + + for (SignalAccount *account in self.contactsManager.signalAccounts) { + if ([localNumber isEqual:account.recipientId]) { + continue; + } + [accounts addObject:account]; + if (accounts.count >= 3) { + return accounts; + } + } + + return [accounts copy]; +} + - (void)updateFirstConversationLabel { - NSArray *signalAccounts = self.contactsManager.signalAccounts; + + NSArray *signalAccounts = self.suggestedAccountsForFirstContact; NSString *formatString = @""; NSMutableArray *contactNames = [NSMutableArray new];