This repository was archived by the owner on Aug 24, 2019. It is now read-only.
Conflict fix for #76 (Added support for iOS 8/OS X 10.0 AccessControl (Touch ID) #76)#89
Open
rhodgkins wants to merge 8 commits into
Open
Conflict fix for #76 (Added support for iOS 8/OS X 10.0 AccessControl (Touch ID) #76)#89rhodgkins wants to merge 8 commits into
rhodgkins wants to merge 8 commits into
Conversation
Owner
|
I need to go through this. Thanks for your work on it. Want to be careful before making such a large change. /cc @calebd |
Closed
`SSKeychainCreateFlags` should use `NS_OPTIONS` not `NS_ENUM` so it can be correctly converted in Swift.
…cent framework refactor. Also changed to use @import.
…ccess control is available, matching the system used for checking is synchronization is available
…cess control header
… while it actually contains UTF-16
Author
|
I've just done another rebase to bring it inline with some recent commits. Cheers, Rich |
Owner
|
I'll do my best to take a look at this soon. Thanks for all of your work on this! |
|
Is this going to be merged in? or more work required? (anything needing help on?) |
|
👍 |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
5 participants
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.
I've rebased the implementation made by @liamnichols (:thumbsup: btw) from #76 and fixed all the conflicts.
I needed the bug fix for #84 so I thought I'd merge in all the changes...
I've also added a similar runtime and compile time check for access control (3e7a31b)