Skip to content
This repository has been 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
wants to merge 8 commits into
base: master
Choose a base branch
from

Conversation

rhodgkins
Copy link

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)

@soffes
Copy link
Owner

soffes commented Feb 23, 2015

I need to go through this. Thanks for your work on it. Want to be careful before making such a large change. /cc @calebd

@rhodgkins rhodgkins mentioned this pull request Feb 23, 2015
liamnichols and others added 8 commits May 4, 2015 10:35
`SSKeychainCreateFlags` should use `NS_OPTIONS` not `NS_ENUM` so it can be correctly converted in Swift.
…ccess control is available, matching the system used for checking is synchronization is available
@rhodgkins
Copy link
Author

I've just done another rebase to bring it inline with some recent commits.

Cheers,

Rich

@soffes
Copy link
Owner

soffes commented May 4, 2015

I'll do my best to take a look at this soon. Thanks for all of your work on this!

@tommeier
Copy link

tommeier commented Sep 8, 2015

Is this going to be merged in? or more work required? (anything needing help on?)

@alexruperez
Copy link

👍

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants