Protect private tabs with biometric authentication via tab tray #32411
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| APP_VERSION = 149.2 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -498,7 +498,9 @@ final class BrowserCoordinator: BaseCoordinator, | |
| } | ||
|
|
||
| func didFinishSettings(from coordinator: SettingsCoordinator) { | ||
| router.dismiss(animated: true, completion: { [weak browserViewController] in | ||
| browserViewController?.settingsControllerDidHide() | ||
| }) | ||
| remove(child: coordinator) | ||
| } | ||
|
|
||
|
|
@@ -944,7 +946,7 @@ final class BrowserCoordinator: BaseCoordinator, | |
| coordinator.showQRCode(delegate: delegate) | ||
| } | ||
|
|
||
| func showTabTray(selectedPanel: TabTrayPanelType, animated: Bool) { | ||
| guard !childCoordinators.contains(where: { $0 is TabTrayCoordinator }) else { | ||
| return // flow is already handled | ||
| } | ||
|
|
@@ -983,9 +985,12 @@ final class BrowserCoordinator: BaseCoordinator, | |
| if featureFlags.isFeatureEnabled(.tabTrayUIExperiments, checking: .buildOnly) && | ||
| UIDevice.current.userInterfaceIdiom != .pad && selectedPanel != .syncedTabs { | ||
| guard let tabTrayVC = tabTrayCoordinator.tabTrayViewController else { return } | ||
| present(navigationController, | ||
|
Contributor
There was a problem hiding this comment. Is there a case where
Author
There was a problem hiding this comment. showPrivacyOverlayIfNeeded in bvc calls with animated false on appDidEnterBackgroundNotification event |
||
| customTransition: tabTrayVC, | ||
| style: modalPresentationStyle, | ||
| animated: animated) | ||
| } else { | ||
| present(navigationController, animated: animated) | ||
| } | ||
| guard browserViewController.isAppStoreReviewTriggerEnabled else { return } | ||
| browserViewController.ratingPromptManager.showRatingPromptIfNeeded() | ||
|
|
@@ -994,12 +999,13 @@ final class BrowserCoordinator: BaseCoordinator, | |
| // This implementation of present is specifically for the animation on .tabTrayUIExperiments | ||
| private func present(_ viewController: UIViewController, | ||
| customTransition: UIViewControllerTransitioningDelegate, | ||
| style: UIModalPresentationStyle, | ||
| animated: Bool = true) { | ||
| browserViewController.willNavigateAway(from: tabManager.selectedTab) | ||
| if !UIAccessibility.isReduceMotionEnabled { | ||
| router.present( | ||
| viewController, | ||
| animated: animated, | ||
| customTransition: customTransition, | ||
| presentationStyle: style | ||
| ) | ||
|
|
@@ -1008,9 +1014,9 @@ final class BrowserCoordinator: BaseCoordinator, | |
| } | ||
| } | ||
|
|
||
| private func present(_ viewController: UIViewController, animated: Bool = true) { | ||
| browserViewController.willNavigateAway(from: tabManager.selectedTab) | ||
| router.present(viewController, animated: animated) | ||
| } | ||
|
|
||
| func showBackForwardList() { | ||
|
|
@@ -1253,6 +1259,15 @@ final class BrowserCoordinator: BaseCoordinator, | |
| // [FXIOS-10482] Initial bandaid for memory leaking during tab tray open/close. Needs further investigation. | ||
| coordinator.dismissChildTabTrayPanels() | ||
| remove(child: coordinator) | ||
| let panel = TabTrayPanelType.convert(from: tabManager.selectedTab) | ||
| store.dispatch( | ||
| PrivateLockAction( | ||
| windowUUID: windowUUID, | ||
| actionType: PrivateLockActionType.didChangeTrayPresentation, | ||
| trayDisplayContext: .page, | ||
| trayPanelType: panel | ||
| ) | ||
| ) | ||
|
Comment on lines
+1263
to
+1270
Contributor
There was a problem hiding this comment. It is not clear to me from the naming what the action is actually doing here. Is there a more intuitive name we could use? Here are the action naming conventions if helpful! https://github.com/mozilla-mobile/firefox-ios/wiki/Redux-Guidelines---FAQs#tips |
||
| } | ||
|
|
||
| // MARK: - WindowEventCoordinator | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| // This Source Code Form is subject to the terms of the Mozilla Public | ||
| // License, v. 2.0. If a copy of the MPL was not distributed with this | ||
| // file, You can obtain one at http://mozilla.org/MPL/2.0/ | ||
|
|
||
| import Common | ||
| import Redux | ||
|
|
||
| enum PrivateLockActionType: ActionType { | ||
| case privateAuthRequested(String) | ||
| case didChangeTrayDisplayContext | ||
| case didChangeTrayPresentation | ||
| case didEnterBackground | ||
| case willEnterForeground | ||
| case didChangePrivateTabsLockSetting | ||
| } | ||
|
|
||
| struct PrivateLockAction: Action { | ||
| let windowUUID: WindowUUID | ||
| let actionType: ActionType | ||
| let trayDisplayContext: BrowserViewControllerState.TrayDisplayContext? | ||
| let trayPanelType: TabTrayPanelType? | ||
|
|
||
| init(windowUUID: WindowUUID, | ||
| actionType: ActionType, | ||
| trayDisplayContext: BrowserViewControllerState.TrayDisplayContext? = nil, | ||
| trayPanelType: TabTrayPanelType? = nil) { | ||
| self.windowUUID = windowUUID | ||
| self.actionType = actionType | ||
| self.trayDisplayContext = trayDisplayContext | ||
| self.trayPanelType = trayPanelType | ||
| } | ||
| } | ||
|
|
||
| enum PrivateLockMiddlewareActionType: ActionType { | ||
| case didChangePrivateLockState | ||
| case didChangeTabTrayPanelType | ||
| case didChangeTrayDisplayContext | ||
| } | ||
|
|
||
| struct PrivateLockMiddlewareAction: Action { | ||
| let windowUUID: WindowUUID | ||
| let actionType: ActionType | ||
| let privateLockState: PrivateLockDomainState? | ||
| let trayPanelType: TabTrayPanelType? | ||
| let trayDisplayContext: BrowserViewControllerState.TrayDisplayContext? | ||
| let privateLockEnabled: Bool? | ||
|
|
||
| init(windowUUID: WindowUUID, | ||
| actionType: ActionType, | ||
| privatePanelLockState: PrivateLockDomainState? = nil, | ||
| trayPanelType: TabTrayPanelType? = nil, | ||
| trayDisplayContext: BrowserViewControllerState.TrayDisplayContext? = nil, | ||
| privateLockEnabled: Bool? = nil) { | ||
| self.windowUUID = windowUUID | ||
| self.actionType = actionType | ||
| self.privateLockState = privatePanelLockState | ||
| self.trayPanelType = trayPanelType | ||
| self.trayDisplayContext = trayDisplayContext | ||
| self.privateLockEnabled = privateLockEnabled | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this change needed for?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it's just a hook to check actual state on possible settings change in order to show tray and lock on it