Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FXIOS-759 ⁃ Fix #7123: Empty logins view after switching to a different app #7164

Merged
merged 3 commits into from
Aug 25, 2020
Merged

FXIOS-759 ⁃ Fix #7123: Empty logins view after switching to a different app #7164

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef2bea2
Update SensitiveViewController.swift
vphong Aug 19, 2020
65620a5
Update SensitiveViewController.swift
vphong Aug 19, 2020
b8be0af
more dismisses + animate for UI smoothness
vphong Aug 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions Client/Frontend/AuthenticationManager/SensitiveViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ class SensitiveViewController: UIViewController {
notificationCenter.addObserver(self, selector: #selector(checkIfUserRequiresValidation), name: UIApplication.willEnterForegroundNotification, object: nil)
notificationCenter.addObserver(self, selector: #selector(checkIfUserRequiresValidation), name: UIApplication.didBecomeActiveNotification, object: nil)
notificationCenter.addObserver(self, selector: #selector(blurContents), name: UIApplication.willResignActiveNotification, object: nil)
notificationCenter.addObserver(self, selector: #selector(hideLogins), name: UIApplication.didEnterBackgroundNotification, object: nil)

notificationCenter.addObserver(self, selector: #selector(blurContents), name: UIApplication.didEnterBackgroundNotification, object: nil)
}

override func viewWillDisappear(_ animated: Bool) {
Expand Down Expand Up @@ -54,7 +53,6 @@ class SensitiveViewController: UIViewController {
self.view.alpha = 0
self.promptingForTouchID = false
self.authState = .notAuthenticating
_ = self.navigationController?.popToRootViewController(animated: false)
self.dismiss(animated: false)
},
fallback: {
Expand All @@ -67,7 +65,6 @@ class SensitiveViewController: UIViewController {
} else {
// On cancel, the login list can appear for a split-second, set the view to transparent to avoid this.
self.view.alpha = 0
_ = self.navigationController?.popToRootViewController(animated: false)
self.dismiss(animated: false)
self.authState = .notAuthenticating
}
Expand All @@ -77,10 +74,6 @@ class SensitiveViewController: UIViewController {
authState = .presenting
}

@objc func hideLogins() {
_ = self.navigationController?.popToRootViewController(animated: true)
}

@objc func blurContents() {
if backgroundedBlur == nil {
backgroundedBlur = addBlurredContent()
Expand Down