diff --git a/Signal/src/ViewControllers/ContactsViewHelper.h b/Signal/src/ViewControllers/ContactsViewHelper.h index 4077b6ccb..3101659ab 100644 --- a/Signal/src/ViewControllers/ContactsViewHelper.h +++ b/Signal/src/ViewControllers/ContactsViewHelper.h @@ -46,9 +46,9 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, readonly) NSArray *blockedPhoneNumbers; -// Suitable to display when the user tries to perform an action which is not possible due to the user having +// Suitable when the user tries to perform an action which is not possible due to the user having // previously denied contact access. -@property (nonatomic, readonly) UIAlertController *missingContactAccessAlertController; +- (void)presentMissingContactAccessAlertControllerFromViewController:(UIViewController *)viewController; - (instancetype)init NS_UNAVAILABLE; diff --git a/Signal/src/ViewControllers/ContactsViewHelper.m b/Signal/src/ViewControllers/ContactsViewHelper.m index 2069624e0..58f8f9981 100644 --- a/Signal/src/ViewControllers/ContactsViewHelper.m +++ b/Signal/src/ViewControllers/ContactsViewHelper.m @@ -297,7 +297,7 @@ NS_ASSUME_NONNULL_BEGIN #pragma mark - Editing -- (UIAlertController *)missingContactAccessAlertController +- (void)presentMissingContactAccessAlertControllerFromViewController:(UIViewController *)viewController { UIAlertController *alertController = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"EDIT_CONTACT_WITHOUT_CONTACTS_PERMISSION_ALERT_TITLE", comment @@ -323,7 +323,7 @@ NS_ASSUME_NONNULL_BEGIN [[UIApplication sharedApplication] openSystemSettings]; }]]; - return alertController; + [viewController presentViewController:alertController animated:YES completion:nil]; } - (void)presentContactViewControllerForRecipientId:(NSString *)recipientId @@ -351,7 +351,7 @@ NS_ASSUME_NONNULL_BEGIN } if (!self.contactsManager.isSystemContactsAuthorized) { - [fromViewController presentViewController:self.missingContactAccessAlertController animated:YES completion:nil]; + [self presentMissingContactAccessAlertControllerFromViewController:fromViewController]; return; } diff --git a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m index 588d8de3c..a00013269 100644 --- a/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m +++ b/Signal/src/ViewControllers/OWSConversationSettingsTableViewController.m @@ -770,9 +770,7 @@ NS_ASSUME_NONNULL_BEGIN } if (!self.contactsManager.isSystemContactsAuthorized) { - [self presentViewController:self.contactsViewHelper.missingContactAccessAlertController - animated:YES - completion:nil]; + [self.contactsViewHelper presentMissingContactAccessAlertControllerFromViewController:self]; return; }