diff --git a/Signal/src/Profiles/OWSProfileManager.h b/Signal/src/Profiles/OWSProfileManager.h index 2b73b34cc..a54bda298 100644 --- a/Signal/src/Profiles/OWSProfileManager.h +++ b/Signal/src/Profiles/OWSProfileManager.h @@ -83,7 +83,6 @@ extern const NSUInteger kOWSProfileManager_MaxAvatarDiameter; - (void)presentAddThreadToProfileWhitelist:(TSThread *)thread fromViewController:(UIViewController *)fromViewController - messageSender:(OWSMessageSender *)messageSender success:(void (^)())successHandler; @end diff --git a/Signal/src/Profiles/OWSProfileManager.m b/Signal/src/Profiles/OWSProfileManager.m index 18633e1e3..863ace342 100644 --- a/Signal/src/Profiles/OWSProfileManager.m +++ b/Signal/src/Profiles/OWSProfileManager.m @@ -1339,7 +1339,6 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640; - (void)presentAddThreadToProfileWhitelist:(TSThread *)thread fromViewController:(UIViewController *)fromViewController - messageSender:(OWSMessageSender *)messageSender success:(void (^)())successHandler { AssertIsOnMainThread(); @@ -1353,7 +1352,6 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640; style:UIAlertActionStyleDefault handler:^(UIAlertAction *_Nonnull action) { [self userAddedThreadToProfileWhitelist:thread - messageSender:messageSender success:successHandler]; }]]; [alertController addAction:[OWSAlerts cancelAction]]; @@ -1362,7 +1360,6 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640; } - (void)userAddedThreadToProfileWhitelist:(TSThread *)thread - messageSender:(OWSMessageSender *)messageSender success:(void (^)())successHandler { AssertIsOnMainThread(); @@ -1378,7 +1375,7 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640; return; } - [messageSender sendMessage:message + [self.messageSender sendMessage:message success:^{ DDLogInfo(@"%@ Successfully sent profile key message to thread: %@", self.tag, thread); [OWSProfileManager.sharedManager addThreadToProfileWhitelist:thread]; diff --git a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m index 38352d76a..defb1508f 100644 --- a/Signal/src/ViewControllers/ConversationView/MessagesViewController.m +++ b/Signal/src/ViewControllers/ConversationView/MessagesViewController.m @@ -2791,7 +2791,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) { { [[OWSProfileManager sharedManager] presentAddThreadToProfileWhitelist:self.thread fromViewController:self - messageSender:self.messageSender success:successHandler]; } diff --git a/Signal/src/ViewControllers/OWSConversationSettingsViewController.m b/Signal/src/ViewControllers/OWSConversationSettingsViewController.m index cfe2255a8..fd197388b 100644 --- a/Signal/src/ViewControllers/OWSConversationSettingsViewController.m +++ b/Signal/src/ViewControllers/OWSConversationSettingsViewController.m @@ -787,7 +787,6 @@ NS_ASSUME_NONNULL_BEGIN [OWSProfileManager.sharedManager presentAddThreadToProfileWhitelist:self.thread fromViewController:self - messageSender:self.messageSender success:^{ [self updateTableContents]; }];