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

Apply presentAlert() throughout codebase.

This commit is contained in:
Matthew Chen 2019-03-21 10:58:49 -04:00
parent 882dd16d7c
commit 908fe1d0c9
2 changed files with 40 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
SignalMessaging/ViewControllers/SharingThreadPickerViewController.m
View File

@ -434,7 +434,7 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion);
if (error) {
[fromViewController
dismissViewControllerAnimated:YES
completion:^(void) {
completion:^{
OWSLogInfo(@"Sending message failed with error: %@", error);
[self showSendFailureAlertWithError:error
message:message
@ -448,11 +448,10 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion);
});
};
[fromViewController presentViewController:progressAlert
animated:YES
completion:^(void) {
sendMessageBlock(sendCompletion);
}];
[fromViewController presentAlert:progressAlert
completion:^{
sendMessageBlock(sendCompletion);
}];
}
- (void)showSendFailureAlertWithError:(NSError *)error
@ -503,7 +502,7 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion);
OWSFailDebug(@"Untrusted recipient error is missing recipient id.");
}
[fromViewController presentViewController:failureAlert animated:YES completion:nil];
[fromViewController presentAlert:failureAlert];
} else {
// Non-identity failure, e.g. network offline, rate limit
@ -526,7 +525,7 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion);
}];
[failureAlert addAction:retryAction];
[fromViewController presentViewController:failureAlert animated:YES completion:nil];
[fromViewController presentAlert:failureAlert];
}
}
@ -597,30 +596,28 @@ typedef void (^SendMessageBlock)(SendCompletionBlock completion);
[progressAlert addAction:progressCancelAction];
[fromViewController
presentViewController:progressAlert
animated:YES
completion:^(void) {
[self.messageSender sendMessage:message
success:^(void) {
OWSLogInfo(@"Resending attachment succeeded.");
dispatch_async(dispatch_get_main_queue(), ^(void) {
[self.shareViewDelegate shareViewWasCompleted];
});
}
failure:^(NSError *error) {
dispatch_async(dispatch_get_main_queue(), ^(void) {
[fromViewController
dismissViewControllerAnimated:YES
completion:^(void) {
OWSLogInfo(
@"Sending attachment failed with error: %@", error);
[self showSendFailureAlertWithError:error
message:message
fromViewController:fromViewController];
}];
});
}];
}];
presentAlert:progressAlert
completion:^{
[self.messageSender sendMessage:message
success:^{
OWSLogInfo(@"Resending attachment succeeded.");
dispatch_async(dispatch_get_main_queue(), ^{
[self.shareViewDelegate shareViewWasCompleted];
});
}
failure:^(NSError *error) {
dispatch_async(dispatch_get_main_queue(), ^{
[fromViewController
dismissViewControllerAnimated:YES
completion:^{
OWSLogInfo(@"Sending attachment failed with error: %@", error);
[self showSendFailureAlertWithError:error
message:message
fromViewController:fromViewController];
}];
});
}];
}];
}
- (void)attachmentUploadProgress:(NSNotification *)notification

11
SignalMessaging/categories/UIView+OWS.swift
View File

@ -144,6 +144,17 @@ public extension UIViewController {
alert.applyAccessibilityIdentifiers()
})
}
@objc
public func presentAlert(_ alert: UIAlertController, completion: @escaping (() -> Void)) {
self.present(alert,
animated: true,
completion: {
alert.applyAccessibilityIdentifiers()
completion()
})
}
}
// MARK: -