Skip to content

Commit

Permalink
Merge branch 'lantean/1605-universal-links' into add/magic-link-auth
Browse files Browse the repository at this point in the history
  • Loading branch information
jleandroperez committed Jul 1, 2024
2 parents 59f9542 + 812d622 commit 0c8cc26
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ only_rules:
# - trailing_whitespace

# - vertical_whitespace

- custom_rules

# Rules configuration
Expand Down
4 changes: 2 additions & 2 deletions Simplenote/SPAppDelegate+Extensions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -452,13 +452,13 @@ extension SPAppDelegate {
func performMagicLinkAuthentication(with url: URL) -> Bool {
MagicLinkAuthenticator(authenticator: simperium.authenticator).handle(url: url)
}

@objc(performMagicLinkAuthenticationWithUserActivity:)
func performMagicLinkAuthentication(with userActivity: NSUserActivity) -> Bool {
guard let url = userActivity.webpageURL else {
return false
}

return performMagicLinkAuthentication(with: url)
}
}
Expand Down

0 comments on commit 0c8cc26

Please sign in to comment.