oxen-io
/
session-ios
mirror of https://github.com/oxen-io/session-ios.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove retry logic per code review 

the system naturally recovers anyway, upon sending messages, no need to
hit the user with another alert.

// FREEBIE
This commit is contained in:
Michael Kirk 2017-08-29 10:45:36 -04:00
parent d71b7684a6
commit 42934e5fd4
2 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Signal/src/Profiles/OWSProfileManager.m
View File

@ -1352,20 +1352,18 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
[alertController addAction:[UIAlertAction actionWithTitle:shareTitle
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *_Nonnull action) {
[self addThreadToProfileWhitelist:thread
fromViewController:fromViewController
messageSender:messageSender
success:successHandler];
[self userAddedThreadToProfileWhitelist:thread
messageSender:messageSender
success:successHandler];
}]];
[alertController addAction:[OWSAlerts cancelAction]];
[fromViewController presentViewController:alertController animated:YES completion:nil];
}
- (void)addThreadToProfileWhitelist:(TSThread *)thread
fromViewController:(UIViewController *)fromViewController
messageSender:(OWSMessageSender *)messageSender
success:(void (^)())successHandler
- (void)userAddedThreadToProfileWhitelist:(TSThread *)thread
messageSender:(OWSMessageSender *)messageSender
success:(void (^)())successHandler
{
AssertIsOnMainThread();
@ -1392,23 +1390,6 @@ const NSUInteger kOWSProfileManager_MaxAvatarDiameter = 640;
failure:^(NSError *_Nonnull error) {
dispatch_async(dispatch_get_main_queue(), ^{
DDLogError(@"%@ Failed to send profile key message to thread: %@", self.tag, thread);
UIAlertController *retryAlertController = [UIAlertController
alertControllerWithTitle:NSLocalizedString(@"SHARE_PROFILE_FAILED_TITLE", @"alert title")
message:error.localizedDescription
preferredStyle:UIAlertControllerStyleAlert];
[retryAlertController
addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"RETRY_BUTTON_TEXT", nil)
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *_Nonnull retryAction) {
[self addThreadToProfileWhitelist:thread
fromViewController:fromViewController
messageSender:messageSender
success:successHandler];
}]];
[retryAlertController addAction:[OWSAlerts cancelAction]];
[fromViewController presentViewController:retryAlertController animated:YES completion:nil];
});
}];
}

3
Signal/translations/en.lproj/Localizable.strings
View File

@ -1417,9 +1417,6 @@
/* action sheet item */
"SHARE_ACTION_TWEET" = "Twitter";
/* alert title */
"SHARE_PROFILE_FAILED_TITLE" = "Failed to Share Your Profile";
/* Action sheet item */
"SHOW_SAFETY_NUMBER_ACTION" = "Show New Safety Number";