Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replaced SAMKeychain with SSKeychain #94

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replaced SAMKeychain with SSKeychain #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions VENTouchLock/VENTouchLock.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#import "VENTouchLock.h"

#import <SAMKeychain/SAMKeychain.h>
#import <SSKeychain/SSKeychain.h>
#import <LocalAuthentication/LocalAuthentication.h>
#import "UIViewController+VENTouchLock.h"

Expand Down Expand Up @@ -74,7 +74,7 @@ - (NSString *)currentPasscode
{
NSString *service = self.keychainService;
NSString *account = self.keychainAccount;
return [SAMKeychain passwordForService:service account:account];
return [SSKeychain passwordForService:service account:account];
}

- (BOOL)isPasscodeValid:(NSString *)passcode
Expand All @@ -86,7 +86,7 @@ - (void)setPasscode:(NSString *)passcode
{
NSString *service = self.keychainService;
NSString *account = self.keychainAccount;
[SAMKeychain setPassword:passcode forService:service account:account];
[SSKeychain setPassword:passcode forService:service account:account];
}

- (void)deletePasscode
Expand All @@ -97,7 +97,7 @@ - (void)deletePasscode

NSString *service = self.keychainService;
NSString *account = self.keychainAccount;
[SAMKeychain deletePasswordForService:service account:account];
[SSKeychain deletePasswordForService:service account:account];
}


Expand Down
9 changes: 8 additions & 1 deletion VENTouchLockSample/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,15 @@ DEPENDENCIES:
- KIF (~> 3.0)
- SSKeychain (~> 1.2.2)

SPEC REPOS:
https://github.com/cocoapods/specs.git:
- KIF
- SSKeychain

SPEC CHECKSUMS:
KIF: b0bd762b0c7890b04920cf618021d6d4fd5127bd
SSKeychain: 88767e903ee8d274ed380e364d96b7a101235286

COCOAPODS: 0.37.2
PODFILE CHECKSUM: 67d6b2d616d8a907e1241fb30fe6406e14cf51c5

COCOAPODS: 1.5.3
110 changes: 46 additions & 64 deletions VENTouchLockSample/VENTouchLockSample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
3A709AD719BE79E200AC9238 /* VENTouchLockPasscodeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A709ACF19BE79E200AC9238 /* VENTouchLockPasscodeViewController.m */; };
3A709AD819BE79E200AC9238 /* VENTouchLockCreatePasscodeViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A709AD119BE79E200AC9238 /* VENTouchLockCreatePasscodeViewController.m */; };
3A709AD919BE79E200AC9238 /* VENTouchLockSplashViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A709AD319BE79E200AC9238 /* VENTouchLockSplashViewController.m */; };
3CB39AF26C0641F6B0C50B4E /* libPods-VENTouchLockSample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 37EB00814E9E4DCF915F1038 /* libPods-VENTouchLockSample.a */; };
613DDA9350FEC1D7ABEE88A1 /* libPods-VENTouchLockSampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B44D972F9524FA1F889F1FF /* libPods-VENTouchLockSampleTests.a */; };
5521D2EAC8BAB052F34419E2 /* libPods-VENTouchLockSampleTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B05C446E9CFAE9E2C0EDF50B /* libPods-VENTouchLockSampleTests.a */; };
753B78B4771B27424F8AD6F3 /* libPods-VENTouchLockSample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 62E2E7DF9699B106986759E8 /* libPods-VENTouchLockSample.a */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -40,9 +40,6 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
0B44D972F9524FA1F889F1FF /* libPods-VENTouchLockSampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-VENTouchLockSampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
37B79E730DEAACFC173CB6D8 /* Pods-VENTouchLockSampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VENTouchLockSampleTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-VENTouchLockSampleTests/Pods-VENTouchLockSampleTests.debug.xcconfig"; sourceTree = "<group>"; };
37EB00814E9E4DCF915F1038 /* libPods-VENTouchLockSample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-VENTouchLockSample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
3A30CE2A19A2E7570098AAD1 /* VENTouchLockSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VENTouchLockSample.app; sourceTree = BUILT_PRODUCTS_DIR; };
3A30CE2E19A2E7570098AAD1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3A30CE2F19A2E7570098AAD1 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -77,25 +74,28 @@
3A709AD119BE79E200AC9238 /* VENTouchLockCreatePasscodeViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VENTouchLockCreatePasscodeViewController.m; path = ../../VENTouchLock/Controllers/VENTouchLockCreatePasscodeViewController.m; sourceTree = "<group>"; };
3A709AD219BE79E200AC9238 /* VENTouchLockSplashViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VENTouchLockSplashViewController.h; path = ../../VENTouchLock/Controllers/VENTouchLockSplashViewController.h; sourceTree = "<group>"; };
3A709AD319BE79E200AC9238 /* VENTouchLockSplashViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VENTouchLockSplashViewController.m; path = ../../VENTouchLock/Controllers/VENTouchLockSplashViewController.m; sourceTree = "<group>"; };
5AB2D7A40A8F78F5A272FB9A /* Pods-VENTouchLockSampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VENTouchLockSampleTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-VENTouchLockSampleTests/Pods-VENTouchLockSampleTests.release.xcconfig"; sourceTree = "<group>"; };
96DC1D3043ACB53303A26DF8 /* Pods-VENTouchLockSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VENTouchLockSample.release.xcconfig"; path = "Pods/Target Support Files/Pods-VENTouchLockSample/Pods-VENTouchLockSample.release.xcconfig"; sourceTree = "<group>"; };
D9D9E34C566576FDF01DC47B /* Pods-VENTouchLockSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VENTouchLockSample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-VENTouchLockSample/Pods-VENTouchLockSample.debug.xcconfig"; sourceTree = "<group>"; };
3D017AD4C86C399715C3A1BC /* Pods-VENTouchLockSampleTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VENTouchLockSampleTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-VENTouchLockSampleTests/Pods-VENTouchLockSampleTests.release.xcconfig"; sourceTree = "<group>"; };
47CEE2F2A4AE14F8D6C7CD5A /* Pods-VENTouchLockSample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VENTouchLockSample.release.xcconfig"; path = "Pods/Target Support Files/Pods-VENTouchLockSample/Pods-VENTouchLockSample.release.xcconfig"; sourceTree = "<group>"; };
62E2E7DF9699B106986759E8 /* libPods-VENTouchLockSample.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-VENTouchLockSample.a"; sourceTree = BUILT_PRODUCTS_DIR; };
8E4FA395B27DBE8CF3E76869 /* Pods-VENTouchLockSampleTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VENTouchLockSampleTests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-VENTouchLockSampleTests/Pods-VENTouchLockSampleTests.debug.xcconfig"; sourceTree = "<group>"; };
B05C446E9CFAE9E2C0EDF50B /* libPods-VENTouchLockSampleTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-VENTouchLockSampleTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
FB9131074A24856B44F8F9AB /* Pods-VENTouchLockSample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VENTouchLockSample.debug.xcconfig"; path = "Pods/Target Support Files/Pods-VENTouchLockSample/Pods-VENTouchLockSample.debug.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
3A30CE2719A2E7570098AAD1 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3CB39AF26C0641F6B0C50B4E /* libPods-VENTouchLockSample.a in Frameworks */,
753B78B4771B27424F8AD6F3 /* libPods-VENTouchLockSample.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
3A30CE3D19A2E7570098AAD1 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
613DDA9350FEC1D7ABEE88A1 /* libPods-VENTouchLockSampleTests.a in Frameworks */,
5521D2EAC8BAB052F34419E2 /* libPods-VENTouchLockSampleTests.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -117,8 +117,8 @@
3A30CE2C19A2E7570098AAD1 /* VENTouchLockSample */,
3A30CE4319A2E7570098AAD1 /* VENTouchLockSampleTests */,
3A30CE2B19A2E7570098AAD1 /* Products */,
4C5B3399B50044D79A831474 /* Frameworks */,
B343632D77310CAC73707654 /* Pods */,
9F665E280AD99D2CAE26D859 /* Pods */,
FB8A8241879A9255D7F68921 /* Frameworks */,
);
sourceTree = "<group>";
};
Expand Down Expand Up @@ -224,24 +224,24 @@
name = Views;
sourceTree = "<group>";
};
4C5B3399B50044D79A831474 /* Frameworks */ = {
9F665E280AD99D2CAE26D859 /* Pods */ = {
isa = PBXGroup;
children = (
37EB00814E9E4DCF915F1038 /* libPods-VENTouchLockSample.a */,
0B44D972F9524FA1F889F1FF /* libPods-VENTouchLockSampleTests.a */,
FB9131074A24856B44F8F9AB /* Pods-VENTouchLockSample.debug.xcconfig */,
47CEE2F2A4AE14F8D6C7CD5A /* Pods-VENTouchLockSample.release.xcconfig */,
8E4FA395B27DBE8CF3E76869 /* Pods-VENTouchLockSampleTests.debug.xcconfig */,
3D017AD4C86C399715C3A1BC /* Pods-VENTouchLockSampleTests.release.xcconfig */,
);
name = Frameworks;
name = Pods;
sourceTree = "<group>";
};
B343632D77310CAC73707654 /* Pods */ = {
FB8A8241879A9255D7F68921 /* Frameworks */ = {
isa = PBXGroup;
children = (
D9D9E34C566576FDF01DC47B /* Pods-VENTouchLockSample.debug.xcconfig */,
96DC1D3043ACB53303A26DF8 /* Pods-VENTouchLockSample.release.xcconfig */,
37B79E730DEAACFC173CB6D8 /* Pods-VENTouchLockSampleTests.debug.xcconfig */,
5AB2D7A40A8F78F5A272FB9A /* Pods-VENTouchLockSampleTests.release.xcconfig */,
62E2E7DF9699B106986759E8 /* libPods-VENTouchLockSample.a */,
B05C446E9CFAE9E2C0EDF50B /* libPods-VENTouchLockSampleTests.a */,
);
name = Pods;
name = Frameworks;
sourceTree = "<group>";
};
/* End PBXGroup section */
Expand All @@ -251,11 +251,10 @@
isa = PBXNativeTarget;
buildConfigurationList = 3A30CE4A19A2E7570098AAD1 /* Build configuration list for PBXNativeTarget "VENTouchLockSample" */;
buildPhases = (
F6AE6D92279F4D37A5D56631 /* Check Pods Manifest.lock */,
AD504363F1A408B0AC4C2F18 /* [CP] Check Pods Manifest.lock */,
3A30CE2619A2E7570098AAD1 /* Sources */,
3A30CE2719A2E7570098AAD1 /* Frameworks */,
3A30CE2819A2E7570098AAD1 /* Resources */,
CAD8BBBCAE654AF291F98BED /* Copy Pods Resources */,
);
buildRules = (
);
Expand All @@ -270,11 +269,10 @@
isa = PBXNativeTarget;
buildConfigurationList = 3A30CE4D19A2E7570098AAD1 /* Build configuration list for PBXNativeTarget "VENTouchLockSampleTests" */;
buildPhases = (
95E80BD87FBE117D0250735B /* Check Pods Manifest.lock */,
0BDA403533D0C30499E7521E /* [CP] Check Pods Manifest.lock */,
3A30CE3C19A2E7570098AAD1 /* Sources */,
3A30CE3D19A2E7570098AAD1 /* Frameworks */,
3A30CE3E19A2E7570098AAD1 /* Resources */,
FEC58580E8951BD81F554663 /* Copy Pods Resources */,
);
buildRules = (
);
Expand Down Expand Up @@ -345,64 +343,48 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
95E80BD87FBE117D0250735B /* Check Pods Manifest.lock */ = {
0BDA403533D0C30499E7521E /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Check Pods Manifest.lock";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
showEnvVarsInLog = 0;
};
CAD8BBBCAE654AF291F98BED /* Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "Copy Pods Resources";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VENTouchLockSample/Pods-VENTouchLockSample-resources.sh\"\n";
showEnvVarsInLog = 0;
};
F6AE6D92279F4D37A5D56631 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
name = "Check Pods Manifest.lock";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-VENTouchLockSampleTests-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
FEC58580E8951BD81F554663 /* Copy Pods Resources */ = {
AD504363F1A408B0AC4C2F18 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
);
inputPaths = (
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
"${PODS_ROOT}/Manifest.lock",
);
name = "[CP] Check Pods Manifest.lock";
outputFileListPaths = (
);
name = "Copy Pods Resources";
outputPaths = (
"$(DERIVED_FILE_DIR)/Pods-VENTouchLockSample-checkManifestLockResult.txt",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-VENTouchLockSampleTests/Pods-VENTouchLockSampleTests-resources.sh\"\n";
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -540,7 +522,7 @@
};
3A30CE4B19A2E7570098AAD1 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = D9D9E34C566576FDF01DC47B /* Pods-VENTouchLockSample.debug.xcconfig */;
baseConfigurationReference = FB9131074A24856B44F8F9AB /* Pods-VENTouchLockSample.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand All @@ -553,7 +535,7 @@
};
3A30CE4C19A2E7570098AAD1 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 96DC1D3043ACB53303A26DF8 /* Pods-VENTouchLockSample.release.xcconfig */;
baseConfigurationReference = 47CEE2F2A4AE14F8D6C7CD5A /* Pods-VENTouchLockSample.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
Expand All @@ -566,7 +548,7 @@
};
3A30CE4E19A2E7570098AAD1 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 37B79E730DEAACFC173CB6D8 /* Pods-VENTouchLockSampleTests.debug.xcconfig */;
baseConfigurationReference = 8E4FA395B27DBE8CF3E76869 /* Pods-VENTouchLockSampleTests.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -587,7 +569,7 @@
};
3A30CE4F19A2E7570098AAD1 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 5AB2D7A40A8F78F5A272FB9A /* Pods-VENTouchLockSampleTests.release.xcconfig */;
baseConfigurationReference = 3D017AD4C86C399715C3A1BC /* Pods-VENTouchLockSampleTests.release.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
Expand Down