Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

Commit 76fb483

Browse files
committed
Remove the onDismiss parameter from both NavigateTo types
1 parent 77ad012 commit 76fb483

File tree

2 files changed

+6
-20
lines changed

2 files changed

+6
-20
lines changed

WordPressAuthenticator/Navigation/NavigateToEnterSiteCredentials.swift

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,25 @@ import Foundation
44
///
55
public struct NavigateToEnterSiteCredentials: NavigationCommand {
66
private let loginFields: LoginFields
7-
private let onDismiss: () -> Void
87

9-
public init(loginFields: LoginFields, onDismiss: (() -> Void)?) {
8+
public init(loginFields: LoginFields) {
109
self.loginFields = loginFields
11-
self.onDismiss = onDismiss ?? {}
1210
}
1311
public func execute(from: UIViewController?) {
1412
let navigationController = (from as? UINavigationController) ?? from?.navigationController
1513
presentSiteCredentialsView(navigationController: navigationController,
16-
loginFields: loginFields,
17-
onDismiss: onDismiss)
14+
loginFields: loginFields)
1815
}
1916
}
2017

2118
private extension NavigateToEnterSiteCredentials {
22-
func presentSiteCredentialsView(navigationController: UINavigationController?, loginFields: LoginFields, onDismiss: @escaping () -> Void) {
19+
func presentSiteCredentialsView(navigationController: UINavigationController?, loginFields: LoginFields) {
2320
guard let controller = SiteCredentialsViewController.instantiate(from: .siteAddress) else {
2421
WPAuthenticatorLogError("Failed to navigate to SiteCredentialsViewController")
2522
return
2623
}
2724

2825
controller.loginFields = loginFields
29-
controller.dismissBlock = { _ in
30-
onDismiss()
31-
}
32-
3326
navigationController?.pushViewController(controller, animated: true)
3427
}
3528
}

WordPressAuthenticator/Navigation/NavigateToEnterWPCOMPassword.swift

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,25 @@ import Foundation
44
///
55
public struct NavigateToEnterWPCOMPassword: NavigationCommand {
66
private let loginFields: LoginFields
7-
private let onDismiss: () -> Void
87

9-
public init(loginFields: LoginFields, onDismiss: (() -> Void)?) {
8+
public init(loginFields: LoginFields) {
109
self.loginFields = loginFields
11-
self.onDismiss = onDismiss ?? {}
1210
}
1311
public func execute(from: UIViewController?) {
1412
let navigationController = (from as? UINavigationController) ?? from?.navigationController
1513
presentPasswordView(navigationController: navigationController,
16-
loginFields: loginFields,
17-
onDismiss: onDismiss)
14+
loginFields: loginFields)
1815
}
1916
}
2017

2118
private extension NavigateToEnterWPCOMPassword {
22-
func presentPasswordView(navigationController: UINavigationController?, loginFields: LoginFields, onDismiss: @escaping () -> Void) {
19+
func presentPasswordView(navigationController: UINavigationController?, loginFields: LoginFields) {
2320
guard let controller = PasswordViewController.instantiate(from: .password) else {
2421
WPAuthenticatorLogError("Failed to navigate to PasswordViewController from GetStartedViewController")
2522
return
2623
}
2724

2825
controller.loginFields = loginFields
29-
controller.dismissBlock = { _ in
30-
onDismiss()
31-
}
32-
3326
navigationController?.pushViewController(controller, animated: true)
3427
}
3528
}

0 commit comments

Comments
 (0)