signalapp/Signal-iOS
signalapp/Signal-iOS
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases 4 Wiki Activity

Fix screen lock alerts.

Browse Source
This commit is contained in:
Matthew Chen 2018-04-16 17:39:13 -04:00
parent 66f028a3b3
commit 5cf6e65323
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Signal/src/util/OWSScreenLockUI.m
View File

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

11
SignalMessaging/views/OWSAlerts.swift
View File

@ -34,11 +34,20 @@ import Foundation
@objc
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 alert = UIAlertController(title: title, message: message, preferredStyle: .alert)
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