Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 23:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix sign out warning presentation on iPad

Browse source
This commit is contained in:
SBiOSoftWhare 2019-02-15 12:42:07 +01:00
parent bc8f85ffb4
commit bcbb2f00d6
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Riot/Modules/Settings/SettingsViewController.m
View file

@ -2711,7 +2711,11 @@ SignOutAlertPresenterDelegate>
self.signOutButton = (UIButton*)sender;
MXKeyBackupState backupState = self.mainSession.crypto.backup.state;
[self.signOutAlertPresenter presentFor:backupState from:self animated:YES];
[self.signOutAlertPresenter
presentFor:backupState
from:self
sourceView:self.signOutButton
animated:YES];
}
- (void)onRemove3PID:(NSIndexPath*)path

24
Riot/Modules/Settings/SignOut/SignOutAlertPresenter.swift
View file

@ -29,6 +29,7 @@ final class SignOutAlertPresenter: NSObject {
// MARK: Private
private weak var presentingViewController: UIViewController?
private weak var sourceView: UIView?
// MARK: Public
@ -36,7 +37,8 @@ final class SignOutAlertPresenter: NSObject {
// MARK: - Public
func present(for keyBackupState: MXKeyBackupState, from viewController: UIViewController, animated: Bool) {
func present(for keyBackupState: MXKeyBackupState, from viewController: UIViewController, sourceView: UIView?, animated: Bool) {
self.sourceView = sourceView
self.presentingViewController = viewController
switch keyBackupState {
@ -65,7 +67,7 @@ final class SignOutAlertPresenter: NSObject {
alertContoller.addAction(signoutAction)
alertContoller.addAction(cancelAction)
self.presentingViewController?.present(alertContoller, animated: true, completion: nil)
self.present(alertController: alertContoller, animated: animated)
}
private func presentNonExistingBackupAlert(animated: Bool) {
@ -87,7 +89,7 @@ final class SignOutAlertPresenter: NSObject {
alertContoller.addAction(setUpKeyBackupAction)
alertContoller.addAction(cancelAction)
self.presentingViewController?.present(alertContoller, animated: true, completion: nil)
self.present(alertController: alertContoller, animated: animated)
}
private func presentNonExistingBackupSignOutConfirmationAlert(animated: Bool) {
@ -106,7 +108,7 @@ final class SignOutAlertPresenter: NSObject {
alertContoller.addAction(signOutAction)
alertContoller.addAction(setUpKeyBackupAction)
self.presentingViewController?.present(alertContoller, animated: true, completion: nil)
self.present(alertController: alertContoller, animated: animated)
}
private func presentBackupInProgressAlert(animated: Bool) {
@ -123,6 +125,18 @@ final class SignOutAlertPresenter: NSObject {
alertContoller.addAction(discardKeyBackupAction)
alertContoller.addAction(cancelAction)
self.presentingViewController?.present(alertContoller, animated: true, completion: nil)
self.present(alertController: alertContoller, animated: animated)
}
private func present(alertController: UIAlertController, animated: Bool) {
// Configure source view when alert controller is presented with a popover
if let sourceView = self.sourceView, let popoverPresentationController = alertController.popoverPresentationController {
popoverPresentationController.sourceView = sourceView
popoverPresentationController.sourceRect = sourceView.bounds
popoverPresentationController.permittedArrowDirections = [.down, .up]
}
self.presentingViewController?.present(alertController, animated: animated, completion: nil)
}
}