Fix screen lock alerts.

pull/1/head
Matthew Chen 8 years ago
parent 66f028a3b3
commit 5cf6e65323

@ -393,7 +393,8 @@ const UIWindowLevel UIWindowLevel_Background = -1.f;
buttonAction:^(UIAlertAction *action) { buttonAction:^(UIAlertAction *action) {
// After the alert, re-show the unlock UI. // After the alert, re-show the unlock UI.
[self ensureUI]; [self ensureUI];
}]; }
fromViewController:self.screenBlockingViewController];
} }
// 'Screen Blocking' window obscures the app screen: // 'Screen Blocking' window obscures the app screen:

@ -34,11 +34,20 @@ import Foundation
@objc @objc
public class func showAlert(title: String?, message: String? = nil, buttonTitle: String? = nil, buttonAction: ((UIAlertAction) -> Void)? = nil) { public class func showAlert(title: String?, message: String? = nil, buttonTitle: String? = nil, buttonAction: ((UIAlertAction) -> Void)? = nil) {
guard let fromViewController = CurrentAppContext().frontmostViewController() else {
return
}
showAlert(title: title, message: message, buttonTitle: buttonTitle, buttonAction: buttonAction,
fromViewController: fromViewController)
}
@objc
public class func showAlert(title: String?, message: String? = nil, buttonTitle: String? = nil, buttonAction: ((UIAlertAction) -> Void)? = nil, fromViewController: UIViewController?) {
let actionTitle = buttonTitle ?? NSLocalizedString("OK", comment: "") let actionTitle = buttonTitle ?? NSLocalizedString("OK", comment: "")
let alert = UIAlertController(title: title, message: message, preferredStyle: .alert) let alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
alert.addAction(UIAlertAction(title: actionTitle, style: .default, handler: buttonAction)) alert.addAction(UIAlertAction(title: actionTitle, style: .default, handler: buttonAction))
CurrentAppContext().frontmostViewController()?.present(alert, animated: true, completion: nil) fromViewController?.present(alert, animated: true, completion: nil)
} }
@objc @objc

Loading…
Cancel
Save