use messageSender property now that the class relies on it in multiple

places.

(due to rebase)

// FREEBIE
pull/1/head
Michael Kirk 8 years ago
parent 42934e5fd4
commit ab84cbd670

@ -83,7 +83,6 @@ extern const NSUInteger kOWSProfileManager_MaxAvatarDiameter;
- (void)presentAddThreadToProfileWhitelist:(TSThread *)thread - (void)presentAddThreadToProfileWhitelist:(TSThread *)thread
fromViewController:(UIViewController *)fromViewController fromViewController:(UIViewController *)fromViewController
messageSender:(OWSMessageSender *)messageSender
success:(void (^)())successHandler; success:(void (^)())successHandler;
@end @end

@ -1339,7 +1339,6 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
- (void)presentAddThreadToProfileWhitelist:(TSThread *)thread - (void)presentAddThreadToProfileWhitelist:(TSThread *)thread
fromViewController:(UIViewController *)fromViewController fromViewController:(UIViewController *)fromViewController
messageSender:(OWSMessageSender *)messageSender
success:(void (^)())successHandler success:(void (^)())successHandler
{ {
AssertIsOnMainThread(); AssertIsOnMainThread();
@ -1353,7 +1352,6 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
style:UIAlertActionStyleDefault style:UIAlertActionStyleDefault
handler:^(UIAlertAction *_Nonnull action) { handler:^(UIAlertAction *_Nonnull action) {
[self userAddedThreadToProfileWhitelist:thread [self userAddedThreadToProfileWhitelist:thread
messageSender:messageSender
success:successHandler]; success:successHandler];
}]]; }]];
[alertController addAction:[OWSAlerts cancelAction]]; [alertController addAction:[OWSAlerts cancelAction]];
@ -1362,7 +1360,6 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
} }
- (void)userAddedThreadToProfileWhitelist:(TSThread *)thread - (void)userAddedThreadToProfileWhitelist:(TSThread *)thread
messageSender:(OWSMessageSender *)messageSender
success:(void (^)())successHandler success:(void (^)())successHandler
{ {
AssertIsOnMainThread(); AssertIsOnMainThread();
@ -1378,7 +1375,7 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
return; return;
} }
[messageSender sendMessage:message [self.messageSender sendMessage:message
success:^{ success:^{
DDLogInfo(@"%@ Successfully sent profile key message to thread: %@", self.tag, thread); DDLogInfo(@"%@ Successfully sent profile key message to thread: %@", self.tag, thread);
[OWSProfileManager.sharedManager addThreadToProfileWhitelist:thread]; [OWSProfileManager.sharedManager addThreadToProfileWhitelist:thread];

@ -2791,7 +2791,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
{ {
[[OWSProfileManager sharedManager] presentAddThreadToProfileWhitelist:self.thread [[OWSProfileManager sharedManager] presentAddThreadToProfileWhitelist:self.thread
fromViewController:self fromViewController:self
messageSender:self.messageSender
success:successHandler]; success:successHandler];
} }

@ -787,7 +787,6 @@ NS_ASSUME_NONNULL_BEGIN
[OWSProfileManager.sharedManager presentAddThreadToProfileWhitelist:self.thread [OWSProfileManager.sharedManager presentAddThreadToProfileWhitelist:self.thread
fromViewController:self fromViewController:self
messageSender:self.messageSender
success:^{ success:^{
[self updateTableContents]; [self updateTableContents];
}]; }];

Loading…
Cancel
Save