biometric added
This commit is contained in:
Dawid Kubicki
parent
e2afc3ea4c
commit
b6c655cf1c
@ -9,6 +9,7 @@
|
|||||||
/* Begin PBXBuildFile section */
|
/* Begin PBXBuildFile section */
|
||||||
123D62D321A3148300D5CD74 /* NoteBiometricViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123D62D121A3148300D5CD74 /* NoteBiometricViewController.swift */; };
|
123D62D321A3148300D5CD74 /* NoteBiometricViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123D62D121A3148300D5CD74 /* NoteBiometricViewController.swift */; };
|
||||||
123D62D421A3148300D5CD74 /* NoteBiometricViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 123D62D221A3148300D5CD74 /* NoteBiometricViewController.xib */; };
|
123D62D421A3148300D5CD74 /* NoteBiometricViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 123D62D221A3148300D5CD74 /* NoteBiometricViewController.xib */; };
|
||||||
|
123D62D621A370AD00D5CD74 /* BiometricTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 123D62D521A370AD00D5CD74 /* BiometricTest.swift */; };
|
||||||
18F5657D204DD7AF00F128ED /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 18F5657C204DD7AF00F128ED /* LaunchScreen.storyboard */; };
|
18F5657D204DD7AF00F128ED /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 18F5657C204DD7AF00F128ED /* LaunchScreen.storyboard */; };
|
||||||
48DC83E42012A5D600F82C5D /* FriendCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DC83E22012A5D600F82C5D /* FriendCell.swift */; };
|
48DC83E42012A5D600F82C5D /* FriendCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DC83E22012A5D600F82C5D /* FriendCell.swift */; };
|
||||||
48DC83E52012A5D600F82C5D /* FriendCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 48DC83E32012A5D600F82C5D /* FriendCell.xib */; };
|
48DC83E52012A5D600F82C5D /* FriendCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 48DC83E32012A5D600F82C5D /* FriendCell.xib */; };
|
||||||
@ -32,6 +33,7 @@
|
|||||||
/* Begin PBXFileReference section */
|
/* Begin PBXFileReference section */
|
||||||
123D62D121A3148300D5CD74 /* NoteBiometricViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteBiometricViewController.swift; sourceTree = "<group>"; };
|
123D62D121A3148300D5CD74 /* NoteBiometricViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoteBiometricViewController.swift; sourceTree = "<group>"; };
|
||||||
123D62D221A3148300D5CD74 /* NoteBiometricViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NoteBiometricViewController.xib; sourceTree = "<group>"; };
|
123D62D221A3148300D5CD74 /* NoteBiometricViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = NoteBiometricViewController.xib; sourceTree = "<group>"; };
|
||||||
|
123D62D521A370AD00D5CD74 /* BiometricTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BiometricTest.swift; sourceTree = "<group>"; };
|
||||||
18F5657C204DD7AF00F128ED /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
|
18F5657C204DD7AF00F128ED /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = LaunchScreen.storyboard; sourceTree = "<group>"; };
|
||||||
48DC83E22012A5D600F82C5D /* FriendCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendCell.swift; sourceTree = "<group>"; };
|
48DC83E22012A5D600F82C5D /* FriendCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FriendCell.swift; sourceTree = "<group>"; };
|
||||||
48DC83E32012A5D600F82C5D /* FriendCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FriendCell.xib; sourceTree = "<group>"; };
|
48DC83E32012A5D600F82C5D /* FriendCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = FriendCell.xib; sourceTree = "<group>"; };
|
||||||
@ -138,6 +140,7 @@
|
|||||||
48EA9AF020117C9000146CF7 /* NavigationController.swift */,
|
48EA9AF020117C9000146CF7 /* NavigationController.swift */,
|
||||||
48EA9AD3200FC48100146CF7 /* SplashViewController.swift */,
|
48EA9AD3200FC48100146CF7 /* SplashViewController.swift */,
|
||||||
123D62D121A3148300D5CD74 /* NoteBiometricViewController.swift */,
|
123D62D121A3148300D5CD74 /* NoteBiometricViewController.swift */,
|
||||||
|
123D62D521A370AD00D5CD74 /* BiometricTest.swift */,
|
||||||
123D62D221A3148300D5CD74 /* NoteBiometricViewController.xib */,
|
123D62D221A3148300D5CD74 /* NoteBiometricViewController.xib */,
|
||||||
);
|
);
|
||||||
name = ViewControllers;
|
name = ViewControllers;
|
||||||
@ -200,7 +203,6 @@
|
|||||||
48EA9ABA200FC22200146CF7 /* Frameworks */,
|
48EA9ABA200FC22200146CF7 /* Frameworks */,
|
||||||
48EA9ABB200FC22200146CF7 /* Resources */,
|
48EA9ABB200FC22200146CF7 /* Resources */,
|
||||||
52B361095004F9533772F347 /* [CP] Embed Pods Frameworks */,
|
52B361095004F9533772F347 /* [CP] Embed Pods Frameworks */,
|
||||||
CCE08048E2F58DCDD1B52E7E /* [CP] Copy Pods Resources */,
|
|
||||||
);
|
);
|
||||||
buildRules = (
|
buildRules = (
|
||||||
);
|
);
|
||||||
@ -269,10 +271,12 @@
|
|||||||
inputPaths = (
|
inputPaths = (
|
||||||
"${SRCROOT}/Pods/Target Support Files/Pods-Friendvatars/Pods-Friendvatars-frameworks.sh",
|
"${SRCROOT}/Pods/Target Support Files/Pods-Friendvatars/Pods-Friendvatars-frameworks.sh",
|
||||||
"${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework",
|
"${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework",
|
||||||
|
"${BUILT_PRODUCTS_DIR}/KeychainAccess/KeychainAccess.framework",
|
||||||
);
|
);
|
||||||
name = "[CP] Embed Pods Frameworks";
|
name = "[CP] Embed Pods Frameworks";
|
||||||
outputPaths = (
|
outputPaths = (
|
||||||
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework",
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CryptoSwift.framework",
|
||||||
|
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/KeychainAccess.framework",
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
shellPath = /bin/sh;
|
shellPath = /bin/sh;
|
||||||
@ -297,21 +301,6 @@
|
|||||||
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";
|
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;
|
showEnvVarsInLog = 0;
|
||||||
};
|
};
|
||||||
CCE08048E2F58DCDD1B52E7E /* [CP] Copy Pods Resources */ = {
|
|
||||||
isa = PBXShellScriptBuildPhase;
|
|
||||||
buildActionMask = 2147483647;
|
|
||||||
files = (
|
|
||||||
);
|
|
||||||
inputPaths = (
|
|
||||||
);
|
|
||||||
name = "[CP] Copy Pods Resources";
|
|
||||||
outputPaths = (
|
|
||||||
);
|
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
|
||||||
shellPath = /bin/sh;
|
|
||||||
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Friendvatars/Pods-Friendvatars-resources.sh\"\n";
|
|
||||||
showEnvVarsInLog = 0;
|
|
||||||
};
|
|
||||||
/* End PBXShellScriptBuildPhase section */
|
/* End PBXShellScriptBuildPhase section */
|
||||||
|
|
||||||
/* Begin PBXSourcesBuildPhase section */
|
/* Begin PBXSourcesBuildPhase section */
|
||||||
@ -331,6 +320,7 @@
|
|||||||
48EA9AE220110FEC00146CF7 /* Settings.swift in Sources */,
|
48EA9AE220110FEC00146CF7 /* Settings.swift in Sources */,
|
||||||
48EA9AEB2011172800146CF7 /* DispatchQueue+Delay.swift in Sources */,
|
48EA9AEB2011172800146CF7 /* DispatchQueue+Delay.swift in Sources */,
|
||||||
48EA9AC1200FC22200146CF7 /* AppDelegate.swift in Sources */,
|
48EA9AC1200FC22200146CF7 /* AppDelegate.swift in Sources */,
|
||||||
|
123D62D621A370AD00D5CD74 /* BiometricTest.swift in Sources */,
|
||||||
48DC83E42012A5D600F82C5D /* FriendCell.swift in Sources */,
|
48DC83E42012A5D600F82C5D /* FriendCell.swift in Sources */,
|
||||||
48EA9AD7200FC8B800146CF7 /* AppController.swift in Sources */,
|
48EA9AD7200FC8B800146CF7 /* AppController.swift in Sources */,
|
||||||
);
|
);
|
||||||
|
|||||||
@ -7,7 +7,7 @@
|
|||||||
<key>Friendvatars.xcscheme_^#shared#^_</key>
|
<key>Friendvatars.xcscheme_^#shared#^_</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>orderHint</key>
|
<key>orderHint</key>
|
||||||
<integer>0</integer>
|
<integer>2</integer>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
|||||||
Binary file not shown.
6
Friendvatars/Assets.xcassets/Contents.json
Normal file
6
Friendvatars/Assets.xcassets/Contents.json
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
21
Friendvatars/Assets.xcassets/FaceID.imageset/Contents.json
vendored
Normal file
21
Friendvatars/Assets.xcassets/FaceID.imageset/Contents.json
vendored
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "FaceID.png",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
Friendvatars/Assets.xcassets/FaceID.imageset/FaceID.png
vendored
Normal file
BIN
Friendvatars/Assets.xcassets/FaceID.imageset/FaceID.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.1 KiB |
21
Friendvatars/Assets.xcassets/TouchID.imageset/Contents.json
vendored
Normal file
21
Friendvatars/Assets.xcassets/TouchID.imageset/Contents.json
vendored
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
{
|
||||||
|
"images" : [
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"filename" : "TouchID.png",
|
||||||
|
"scale" : "1x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "2x"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"idiom" : "universal",
|
||||||
|
"scale" : "3x"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"version" : 1,
|
||||||
|
"author" : "xcode"
|
||||||
|
}
|
||||||
|
}
|
||||||
BIN
Friendvatars/Assets.xcassets/TouchID.imageset/TouchID.png
vendored
Normal file
BIN
Friendvatars/Assets.xcassets/TouchID.imageset/TouchID.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 42 KiB |
@ -68,6 +68,8 @@ final class AuthViewController: UIViewController {
|
|||||||
)
|
)
|
||||||
|
|
||||||
registerForKeyboardNotifications()
|
registerForKeyboardNotifications()
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override func viewDidAppear(_ animated: Bool) {
|
override func viewDidAppear(_ animated: Bool) {
|
||||||
|
|||||||
@ -15,7 +15,6 @@
|
|||||||
<outlet property="bottomConstraint" destination="nvR-sM-xyu" id="sfO-yG-bij"/>
|
<outlet property="bottomConstraint" destination="nvR-sM-xyu" id="sfO-yG-bij"/>
|
||||||
<outlet property="containerView" destination="fIM-wX-ThP" id="MCr-wf-hth"/>
|
<outlet property="containerView" destination="fIM-wX-ThP" id="MCr-wf-hth"/>
|
||||||
<outlet property="emailField" destination="vrM-BE-Sxz" id="yN0-VF-tnI"/>
|
<outlet property="emailField" destination="vrM-BE-Sxz" id="yN0-VF-tnI"/>
|
||||||
<outlet property="noteField" destination="nnj-yi-h3Z" id="84h-ZS-5xw"/>
|
|
||||||
<outlet property="passwordField" destination="XnE-em-cB7" id="I2k-JM-vRu"/>
|
<outlet property="passwordField" destination="XnE-em-cB7" id="I2k-JM-vRu"/>
|
||||||
<outlet property="signInButton" destination="hSR-Ry-zgR" id="67R-L3-h8e"/>
|
<outlet property="signInButton" destination="hSR-Ry-zgR" id="67R-L3-h8e"/>
|
||||||
<outlet property="titleLabel" destination="WHD-fd-dhU" id="y4p-7Q-Mwd"/>
|
<outlet property="titleLabel" destination="WHD-fd-dhU" id="y4p-7Q-Mwd"/>
|
||||||
@ -84,20 +83,9 @@
|
|||||||
<constraint firstAttribute="trailing" secondItem="XnE-em-cB7" secondAttribute="trailing" id="sJh-f6-THo"/>
|
<constraint firstAttribute="trailing" secondItem="XnE-em-cB7" secondAttribute="trailing" id="sJh-f6-THo"/>
|
||||||
</constraints>
|
</constraints>
|
||||||
</stackView>
|
</stackView>
|
||||||
<button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DP0-O4-y7W">
|
|
||||||
<rect key="frame" x="102" y="251" width="107" height="30"/>
|
|
||||||
<state key="normal" title="Zobacz notatkę">
|
|
||||||
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
</state>
|
|
||||||
<connections>
|
|
||||||
<action selector="onLogIn:" destination="-1" eventType="touchUpInside" id="JQi-Ha-mlD"/>
|
|
||||||
</connections>
|
|
||||||
</button>
|
|
||||||
</subviews>
|
</subviews>
|
||||||
<color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
|
<color key="backgroundColor" cocoaTouchSystemColor="scrollViewTexturedBackgroundColor"/>
|
||||||
<constraints>
|
<constraints>
|
||||||
<constraint firstItem="DP0-O4-y7W" firstAttribute="centerX" secondItem="fIM-wX-ThP" secondAttribute="centerX" id="4V3-NP-lzu"/>
|
|
||||||
<constraint firstItem="DP0-O4-y7W" firstAttribute="centerY" secondItem="fIM-wX-ThP" secondAttribute="centerY" id="CP4-Fd-N8B"/>
|
|
||||||
<constraint firstAttribute="width" constant="311" id="DbP-S4-tdu"/>
|
<constraint firstAttribute="width" constant="311" id="DbP-S4-tdu"/>
|
||||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="281" id="SeW-ed-E9b"/>
|
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="281" id="SeW-ed-E9b"/>
|
||||||
<constraint firstAttribute="trailing" secondItem="47J-gQ-72v" secondAttribute="trailing" constant="12" id="WkR-AZ-hfk"/>
|
<constraint firstAttribute="trailing" secondItem="47J-gQ-72v" secondAttribute="trailing" constant="12" id="WkR-AZ-hfk"/>
|
||||||
@ -114,21 +102,22 @@
|
|||||||
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
<nil key="highlightedColor"/>
|
<nil key="highlightedColor"/>
|
||||||
</label>
|
</label>
|
||||||
<textField opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="nnj-yi-h3Z">
|
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DP0-O4-y7W">
|
||||||
<rect key="frame" x="24" y="20" width="335" height="30"/>
|
<rect key="frame" x="107" y="501" width="161" height="41"/>
|
||||||
<constraints>
|
<fontDescription key="fontDescription" type="system" pointSize="24"/>
|
||||||
<constraint firstAttribute="width" constant="335" id="Aib-mz-k2j"/>
|
<state key="normal" title="Zobacz notatkę">
|
||||||
<constraint firstAttribute="height" constant="30" id="pF6-VC-P8N"/>
|
<color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||||
</constraints>
|
</state>
|
||||||
<nil key="textColor"/>
|
<connections>
|
||||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
<action selector="onLogIn:" destination="-1" eventType="touchUpInside" id="JQi-Ha-mlD"/>
|
||||||
<textInputTraits key="textInputTraits"/>
|
</connections>
|
||||||
</textField>
|
</button>
|
||||||
</subviews>
|
</subviews>
|
||||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||||
<constraints>
|
<constraints>
|
||||||
<constraint firstItem="fIM-wX-ThP" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="32" id="0Uu-L2-f41"/>
|
<constraint firstItem="fIM-wX-ThP" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" constant="32" id="0Uu-L2-f41"/>
|
||||||
<constraint firstItem="fIM-wX-ThP" firstAttribute="centerY" relation="lessThanOrEqual" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="6Ln-YA-ghi"/>
|
<constraint firstItem="fIM-wX-ThP" firstAttribute="centerY" relation="lessThanOrEqual" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="6Ln-YA-ghi"/>
|
||||||
|
<constraint firstItem="DP0-O4-y7W" firstAttribute="centerY" secondItem="i5M-Pr-FkT" secondAttribute="centerY" constant="188" id="LB1-97-dA8"/>
|
||||||
<constraint firstItem="fIM-wX-ThP" firstAttribute="top" secondItem="WHD-fd-dhU" secondAttribute="bottom" constant="12" id="aP2-gg-QM4"/>
|
<constraint firstItem="fIM-wX-ThP" firstAttribute="top" secondItem="WHD-fd-dhU" secondAttribute="bottom" constant="12" id="aP2-gg-QM4"/>
|
||||||
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="fIM-wX-ThP" secondAttribute="trailing" constant="32" id="eeV-zF-hQt"/>
|
<constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="fIM-wX-ThP" secondAttribute="trailing" constant="32" id="eeV-zF-hQt"/>
|
||||||
<constraint firstItem="tFe-fM-7UZ" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="feS-0C-4ss"/>
|
<constraint firstItem="tFe-fM-7UZ" firstAttribute="leading" secondItem="i5M-Pr-FkT" secondAttribute="leading" id="feS-0C-4ss"/>
|
||||||
@ -138,6 +127,7 @@
|
|||||||
<constraint firstItem="tFe-fM-7UZ" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="qHd-7e-hwP"/>
|
<constraint firstItem="tFe-fM-7UZ" firstAttribute="top" secondItem="i5M-Pr-FkT" secondAttribute="top" id="qHd-7e-hwP"/>
|
||||||
<constraint firstItem="WHD-fd-dhU" firstAttribute="trailing" secondItem="fIM-wX-ThP" secondAttribute="trailing" id="sMj-GC-DPU"/>
|
<constraint firstItem="WHD-fd-dhU" firstAttribute="trailing" secondItem="fIM-wX-ThP" secondAttribute="trailing" id="sMj-GC-DPU"/>
|
||||||
<constraint firstItem="fIM-wX-ThP" firstAttribute="centerY" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="tTe-8n-30L"/>
|
<constraint firstItem="fIM-wX-ThP" firstAttribute="centerY" secondItem="i5M-Pr-FkT" secondAttribute="centerY" id="tTe-8n-30L"/>
|
||||||
|
<constraint firstItem="DP0-O4-y7W" firstAttribute="centerX" secondItem="i5M-Pr-FkT" secondAttribute="centerX" id="uC1-mj-ONQ"/>
|
||||||
<constraint firstAttribute="trailing" secondItem="tFe-fM-7UZ" secondAttribute="trailing" id="zYh-8O-PJL"/>
|
<constraint firstAttribute="trailing" secondItem="tFe-fM-7UZ" secondAttribute="trailing" id="zYh-8O-PJL"/>
|
||||||
</constraints>
|
</constraints>
|
||||||
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
|
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
|
||||||
|
|||||||
15
Friendvatars/BiometricTest.swift
Normal file
15
Friendvatars/BiometricTest.swift
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
//
|
||||||
|
// BiometricTest.swift
|
||||||
|
// Friendvatars
|
||||||
|
//
|
||||||
|
// Created by Dawid Kubicki on 19/11/2018.
|
||||||
|
// Copyright © 2018 Razeware. All rights reserved.
|
||||||
|
//
|
||||||
|
|
||||||
|
import Foundation
|
||||||
|
import LocalAuthentication
|
||||||
|
|
||||||
|
var biometricType: LABiometryType {
|
||||||
|
let authContext = LAContext()
|
||||||
|
return authContext.biometryType
|
||||||
|
}
|
||||||
@ -70,7 +70,7 @@ final class FriendsViewController: UITableViewController {
|
|||||||
} else {
|
} else {
|
||||||
let emailHash = user.email.trimmingCharacters(in: .whitespacesAndNewlines)
|
let emailHash = user.email.trimmingCharacters(in: .whitespacesAndNewlines)
|
||||||
.lowercased()
|
.lowercased()
|
||||||
.md5()
|
.sha1()
|
||||||
|
|
||||||
if let url = URL(string: "https://www.gravatar.com/avatar/" + emailHash) {
|
if let url = URL(string: "https://www.gravatar.com/avatar/" + emailHash) {
|
||||||
URLSession.shared.dataTask(with: url) { data, response, error in
|
URLSession.shared.dataTask(with: url) { data, response, error in
|
||||||
|
|||||||
@ -7,16 +7,55 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
import UIKit
|
import UIKit
|
||||||
|
import KeychainAccess
|
||||||
|
|
||||||
class NoteBiometricViewController: UIViewController {
|
class NoteBiometricViewController: UIViewController {
|
||||||
|
|
||||||
|
@IBAction func isSignOut(_ sender: Any) {
|
||||||
|
try? AuthController.signOut()
|
||||||
|
}
|
||||||
|
@IBOutlet weak var txtSecret: UITextField!
|
||||||
|
@IBOutlet weak var imgBio: UIImageView!
|
||||||
|
@IBOutlet weak var lblSecret: UILabel!
|
||||||
|
|
||||||
|
let keychain = Keychain(service: "com.dawidkubicki.Friendvatars")
|
||||||
|
|
||||||
override func viewDidLoad() {
|
override func viewDidLoad() {
|
||||||
super.viewDidLoad()
|
super.viewDidLoad()
|
||||||
|
|
||||||
// Do any additional setup after loading the view.
|
if(biometricType == .touchID) {
|
||||||
|
imgBio.image = UIImage(named: "TouchID")
|
||||||
|
} else if(biometricType == .faceID) {
|
||||||
|
imgBio.image = UIImage(named: "FaceID")
|
||||||
|
} else if(biometricType == .none) {
|
||||||
|
print("Nie ma możliwości użycia biometrycznego uwierzytelniania")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@IBAction func storeSecret(_ sender: Any) {
|
||||||
|
DispatchQueue.global().async {
|
||||||
|
do {
|
||||||
|
try self.keychain
|
||||||
|
.accessibility(.whenPasscodeSetThisDeviceOnly, authenticationPolicy: .userPresence)
|
||||||
|
.set(self.txtSecret.text!, key: "secret")
|
||||||
|
} catch let error {
|
||||||
|
print(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@IBAction func getSecret(_ sender: Any) {
|
||||||
|
DispatchQueue.global().async {
|
||||||
|
do {
|
||||||
|
let secret = try self.keychain
|
||||||
|
.authenticationPrompt("Zaloguj się biometrycznie, aby zobaczyć notatkę")
|
||||||
|
.get("secret")
|
||||||
|
self.lblSecret.text = "Twoja ukryta notatka to: \(secret!)"
|
||||||
|
} catch let error {
|
||||||
|
print(error)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
/*
|
/*
|
||||||
// MARK: - Navigation
|
// MARK: - Navigation
|
||||||
|
|
||||||
|
|||||||
@ -12,6 +12,9 @@
|
|||||||
<objects>
|
<objects>
|
||||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NoteBiometricViewController" customModule="Friendvatars" customModuleProvider="target">
|
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="NoteBiometricViewController" customModule="Friendvatars" customModuleProvider="target">
|
||||||
<connections>
|
<connections>
|
||||||
|
<outlet property="imgBio" destination="NRj-yT-SM7" id="0s8-hu-SA4"/>
|
||||||
|
<outlet property="lblSecret" destination="UoU-LQ-ogi" id="D8k-bn-yBF"/>
|
||||||
|
<outlet property="txtSecret" destination="u9j-Y0-VNK" id="0Lh-Bw-EbV"/>
|
||||||
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
|
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
|
||||||
</connections>
|
</connections>
|
||||||
</placeholder>
|
</placeholder>
|
||||||
@ -20,14 +23,52 @@
|
|||||||
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
|
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
|
||||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||||
<subviews>
|
<subviews>
|
||||||
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gvc-xD-qpV">
|
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uJw-ng-qkK">
|
||||||
<rect key="frame" x="165" y="101" width="82" height="30"/>
|
<rect key="frame" x="148" y="133" width="79" height="30"/>
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
<state key="normal" title="Kamil lamus"/>
|
<state key="normal" title="Wyloguj się"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="isSignOut:" destination="-1" eventType="touchUpInside" id="jpJ-BH-2WU"/>
|
||||||
|
</connections>
|
||||||
</button>
|
</button>
|
||||||
|
<textField opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="u9j-Y0-VNK">
|
||||||
|
<rect key="frame" x="53" y="193" width="273" height="30"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<nil key="textColor"/>
|
||||||
|
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||||
|
<textInputTraits key="textInputTraits"/>
|
||||||
|
</textField>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7lM-FZ-SRL">
|
||||||
|
<rect key="frame" x="138" y="262" width="102" height="30"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<state key="normal" title="Zapisz notatkę"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="storeSecret:" destination="-1" eventType="touchUpInside" id="Cya-h0-uFW"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="wDa-vm-5Ls">
|
||||||
|
<rect key="frame" x="141" y="353" width="97" height="30"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<state key="normal" title="Pokaż notatkę"/>
|
||||||
|
<connections>
|
||||||
|
<action selector="getSecret:" destination="-1" eventType="touchUpInside" id="Ort-po-DdF"/>
|
||||||
|
</connections>
|
||||||
|
</button>
|
||||||
|
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="NRj-yT-SM7">
|
||||||
|
<rect key="frame" x="123" y="391" width="128" height="128"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
</imageView>
|
||||||
|
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Lbael" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="UoU-LQ-ogi">
|
||||||
|
<rect key="frame" x="53" y="323" width="280" height="21"/>
|
||||||
|
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||||
|
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||||
|
<color key="textColor" red="0.15985122323036194" green="0.82354992628097534" blue="0.071769155561923981" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||||
|
<nil key="highlightedColor"/>
|
||||||
|
</label>
|
||||||
</subviews>
|
</subviews>
|
||||||
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
<color key="backgroundColor" cocoaTouchSystemColor="viewFlipsideBackgroundColor"/>
|
||||||
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
|
<viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
|
||||||
|
<point key="canvasLocation" x="53.600000000000001" y="48.125937031484263"/>
|
||||||
</view>
|
</view>
|
||||||
</objects>
|
</objects>
|
||||||
</document>
|
</document>
|
||||||
|
|||||||
1
Podfile
1
Podfile
@ -3,4 +3,5 @@ use_frameworks!
|
|||||||
|
|
||||||
target 'Friendvatars' do
|
target 'Friendvatars' do
|
||||||
pod 'CryptoSwift'
|
pod 'CryptoSwift'
|
||||||
|
pod 'KeychainAccess'
|
||||||
end
|
end
|
||||||
|
|||||||
12
Podfile.lock
12
Podfile.lock
@ -1,12 +1,20 @@
|
|||||||
PODS:
|
PODS:
|
||||||
- CryptoSwift (0.8.1)
|
- CryptoSwift (0.8.1)
|
||||||
|
- KeychainAccess (3.1.2)
|
||||||
|
|
||||||
DEPENDENCIES:
|
DEPENDENCIES:
|
||||||
- CryptoSwift
|
- CryptoSwift
|
||||||
|
- KeychainAccess
|
||||||
|
|
||||||
|
SPEC REPOS:
|
||||||
|
https://github.com/cocoapods/specs.git:
|
||||||
|
- CryptoSwift
|
||||||
|
- KeychainAccess
|
||||||
|
|
||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
CryptoSwift: 4b07d5b508c1eb67bfa314a727b705f8048a85de
|
CryptoSwift: 4b07d5b508c1eb67bfa314a727b705f8048a85de
|
||||||
|
KeychainAccess: b3816fddcf28aa29d94b10ec305cd52be14c472b
|
||||||
|
|
||||||
PODFILE CHECKSUM: bbf4ad9f3f2f1429ecda282ecb446c084363a23f
|
PODFILE CHECKSUM: 2ccd80ba9984103c7eb7f1175a88d0a90df6c731
|
||||||
|
|
||||||
COCOAPODS: 1.3.1
|
COCOAPODS: 1.5.3
|
||||||
|
|||||||
22
Pods/KeychainAccess/LICENSE
generated
Normal file
22
Pods/KeychainAccess/LICENSE
generated
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
The MIT License (MIT)
|
||||||
|
|
||||||
|
Copyright (c) 2014 kishikawa katsumi
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
|
||||||
2921
Pods/KeychainAccess/Lib/KeychainAccess/Keychain.swift
generated
Normal file
2921
Pods/KeychainAccess/Lib/KeychainAccess/Keychain.swift
generated
Normal file
File diff suppressed because it is too large
Load Diff
602
Pods/KeychainAccess/README.md
generated
Normal file
602
Pods/KeychainAccess/README.md
generated
Normal file
@ -0,0 +1,602 @@
|
|||||||
|
# KeychainAccess
|
||||||
|
[](https://travis-ci.org/kishikawakatsumi/KeychainAccess)
|
||||||
|
[](https://codecov.io/gh/kishikawakatsumi/KeychainAccess)
|
||||||
|
[](https://github.com/Carthage/Carthage)
|
||||||
|
[](http://cocoadocs.org/docsets/KeychainAccess)
|
||||||
|
[](http://cocoadocs.org/docsets/KeychainAccess)
|
||||||
|
[](https://swift.org/)
|
||||||
|
[](https://swift.org/)
|
||||||
|
[](https://swift.org/)
|
||||||
|
[](https://swift.org/)
|
||||||
|
|
||||||
|
KeychainAccess is a simple Swift wrapper for Keychain that works on iOS and OS X. Makes using Keychain APIs extremely easy and much more palatable to use in Swift.
|
||||||
|
|
||||||
|
<img src="https://raw.githubusercontent.com/kishikawakatsumi/KeychainAccess/master/Screenshots/01.png" width="320px" />
|
||||||
|
<img src="https://raw.githubusercontent.com/kishikawakatsumi/KeychainAccess/master/Screenshots/02.png" width="320px" />
|
||||||
|
<img src="https://raw.githubusercontent.com/kishikawakatsumi/KeychainAccess/master/Screenshots/03.png" width="320px" />
|
||||||
|
|
||||||
|
## :bulb: Features
|
||||||
|
|
||||||
|
- Simple interface
|
||||||
|
- Support access group
|
||||||
|
- [Support accessibility](#accessibility)
|
||||||
|
- [Support iCloud sharing](#icloud_sharing)
|
||||||
|
- **[Support TouchID and Keychain integration (iOS 8+)](#touch_id_integration)**
|
||||||
|
- **[Support Shared Web Credentials (iOS 8+)](#shared_web_credentials)**
|
||||||
|
- [Works on both iOS & OS X](#requirements)
|
||||||
|
- [watchOS and tvOS are supported](#requirements)
|
||||||
|
- **[Swift 4 & Swift 3 compatible](#requirements)**
|
||||||
|
|
||||||
|
## :book: Usage
|
||||||
|
|
||||||
|
##### :eyes: See also:
|
||||||
|
- [:link: iOS Example Project](https://github.com/kishikawakatsumi/KeychainAccess/tree/master/Examples/Example-iOS)
|
||||||
|
|
||||||
|
### :key: Basics
|
||||||
|
|
||||||
|
#### Saving Application Password
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
keychain["kishikawakatsumi"] = "01234567-89ab-cdef-0123-456789abcdef"
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Saving Internet Password
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(server: "https://github.com", protocolType: .https)
|
||||||
|
keychain["kishikawakatsumi"] = "01234567-89ab-cdef-0123-456789abcdef"
|
||||||
|
```
|
||||||
|
|
||||||
|
### :key: Instantiation
|
||||||
|
|
||||||
|
#### Create Keychain for Application Password
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
```
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token", accessGroup: "12ABCD3E4F.shared")
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Create Keychain for Internet Password
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(server: "https://github.com", protocolType: .https)
|
||||||
|
```
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(server: "https://github.com", protocolType: .https, authenticationType: .htmlForm)
|
||||||
|
```
|
||||||
|
|
||||||
|
### :key: Adding an item
|
||||||
|
|
||||||
|
#### subscripting
|
||||||
|
|
||||||
|
##### for String
|
||||||
|
|
||||||
|
```swift
|
||||||
|
keychain["kishikawakatsumi"] = "01234567-89ab-cdef-0123-456789abcdef"
|
||||||
|
```
|
||||||
|
|
||||||
|
```swift
|
||||||
|
keychain[string: "kishikawakatsumi"] = "01234567-89ab-cdef-0123-456789abcdef"
|
||||||
|
```
|
||||||
|
|
||||||
|
##### for NSData
|
||||||
|
|
||||||
|
```swift
|
||||||
|
keychain[data: "secret"] = NSData(contentsOfFile: "secret.bin")
|
||||||
|
```
|
||||||
|
|
||||||
|
#### set method
|
||||||
|
|
||||||
|
```swift
|
||||||
|
keychain.set("01234567-89ab-cdef-0123-456789abcdef", key: "kishikawakatsumi")
|
||||||
|
```
|
||||||
|
|
||||||
|
#### error handling
|
||||||
|
|
||||||
|
```swift
|
||||||
|
do {
|
||||||
|
try keychain.set("01234567-89ab-cdef-0123-456789abcdef", key: "kishikawakatsumi")
|
||||||
|
}
|
||||||
|
catch let error {
|
||||||
|
print(error)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### :key: Obtaining an item
|
||||||
|
|
||||||
|
#### subscripting
|
||||||
|
|
||||||
|
##### for String (If the value is NSData, attempt to convert to String)
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let token = keychain["kishikawakatsumi"]
|
||||||
|
```
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let token = keychain[string: "kishikawakatsumi"]
|
||||||
|
```
|
||||||
|
|
||||||
|
##### for NSData
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let secretData = keychain[data: "secret"]
|
||||||
|
```
|
||||||
|
|
||||||
|
#### get methods
|
||||||
|
|
||||||
|
##### as String
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let token = try? keychain.get("kishikawakatsumi")
|
||||||
|
```
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let token = try? keychain.getString("kishikawakatsumi")
|
||||||
|
```
|
||||||
|
|
||||||
|
##### as NSData
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let data = try? keychain.getData("kishikawakatsumi")
|
||||||
|
```
|
||||||
|
|
||||||
|
### :key: Removing an item
|
||||||
|
|
||||||
|
#### subscripting
|
||||||
|
|
||||||
|
```swift
|
||||||
|
keychain["kishikawakatsumi"] = nil
|
||||||
|
```
|
||||||
|
|
||||||
|
#### remove method
|
||||||
|
|
||||||
|
```swift
|
||||||
|
do {
|
||||||
|
try keychain.remove("kishikawakatsumi")
|
||||||
|
} catch let error {
|
||||||
|
print("error: \(error)")
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### :key: Set Label and Comment
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(server: "https://github.com", protocolType: .https)
|
||||||
|
do {
|
||||||
|
try keychain
|
||||||
|
.label("github.com (kishikawakatsumi)")
|
||||||
|
.comment("github access token")
|
||||||
|
.set("01234567-89ab-cdef-0123-456789abcdef", key: "kishikawakatsumi")
|
||||||
|
} catch let error {
|
||||||
|
print("error: \(error)")
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### :key: Obtaining Other Attributes
|
||||||
|
|
||||||
|
#### PersistentRef
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain()
|
||||||
|
let persistentRef = keychain[attributes: "kishikawakatsumi"].persistentRef
|
||||||
|
...
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Creation Date
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain()
|
||||||
|
let creationDate = keychain[attributes: "kishikawakatsumi"].creationDate
|
||||||
|
...
|
||||||
|
```
|
||||||
|
|
||||||
|
#### All Attributes
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain()
|
||||||
|
do {
|
||||||
|
let attributes = try keychain.get("kishikawakatsumi") { $0 }
|
||||||
|
print(attributes.comment)
|
||||||
|
print(attributes.label)
|
||||||
|
print(attributes.creator)
|
||||||
|
...
|
||||||
|
} catch let error {
|
||||||
|
print("error: \(error)")
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
##### subscripting
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain()
|
||||||
|
let attributes = keychain[attributes: "kishikawakatsumi"]
|
||||||
|
print(attributes.comment)
|
||||||
|
print(attributes.label)
|
||||||
|
print(attributes.creator)
|
||||||
|
```
|
||||||
|
|
||||||
|
### :key: Configuration (Accessibility, Sharing, iCloud Sync)
|
||||||
|
|
||||||
|
**Provides fluent interfaces**
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
.label("github.com (kishikawakatsumi)")
|
||||||
|
.synchronizable(true)
|
||||||
|
.accessibility(.afterFirstUnlock)
|
||||||
|
```
|
||||||
|
|
||||||
|
#### <a name="accessibility"> Accessibility
|
||||||
|
|
||||||
|
##### Default accessibility matches background application (=kSecAttrAccessibleAfterFirstUnlock)
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
```
|
||||||
|
|
||||||
|
##### For background application
|
||||||
|
|
||||||
|
###### Creating instance
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
.accessibility(.afterFirstUnlock)
|
||||||
|
|
||||||
|
keychain["kishikawakatsumi"] = "01234567-89ab-cdef-0123-456789abcdef"
|
||||||
|
```
|
||||||
|
|
||||||
|
###### One-shot
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
|
||||||
|
do {
|
||||||
|
try keychain
|
||||||
|
.accessibility(.afterFirstUnlock)
|
||||||
|
.set("01234567-89ab-cdef-0123-456789abcdef", key: "kishikawakatsumi")
|
||||||
|
} catch let error {
|
||||||
|
print("error: \(error)")
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
##### For foreground application
|
||||||
|
|
||||||
|
###### Creating instance
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
.accessibility(.whenUnlocked)
|
||||||
|
|
||||||
|
keychain["kishikawakatsumi"] = "01234567-89ab-cdef-0123-456789abcdef"
|
||||||
|
```
|
||||||
|
|
||||||
|
###### One-shot
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
|
||||||
|
do {
|
||||||
|
try keychain
|
||||||
|
.accessibility(.whenUnlocked)
|
||||||
|
.set("01234567-89ab-cdef-0123-456789abcdef", key: "kishikawakatsumi")
|
||||||
|
} catch let error {
|
||||||
|
print("error: \(error)")
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### :couple: Sharing Keychain items
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token", accessGroup: "12ABCD3E4F.shared")
|
||||||
|
```
|
||||||
|
|
||||||
|
#### <a name="icloud_sharing"> :arrows_counterclockwise: Synchronizing Keychain items with iCloud
|
||||||
|
|
||||||
|
###### Creating instance
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
.synchronizable(true)
|
||||||
|
|
||||||
|
keychain["kishikawakatsumi"] = "01234567-89ab-cdef-0123-456789abcdef"
|
||||||
|
```
|
||||||
|
|
||||||
|
###### One-shot
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
|
||||||
|
do {
|
||||||
|
try keychain
|
||||||
|
.synchronizable(true)
|
||||||
|
.set("01234567-89ab-cdef-0123-456789abcdef", key: "kishikawakatsumi")
|
||||||
|
} catch let error {
|
||||||
|
print("error: \(error)")
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### <a name="touch_id_integration"> :fu: Touch ID integration
|
||||||
|
|
||||||
|
**Any Operation that require authentication must be run in the background thread.**
|
||||||
|
**If you run in the main thread, UI thread will lock for the system to try to display the authentication dialog.**
|
||||||
|
|
||||||
|
#### :closed_lock_with_key: Adding a Touch ID protected item
|
||||||
|
|
||||||
|
If you want to store the Touch ID protected Keychain item, specify `accessibility` and `authenticationPolicy` attributes.
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
|
||||||
|
DispatchQueue.global().async {
|
||||||
|
do {
|
||||||
|
// Should be the secret invalidated when passcode is removed? If not then use `.WhenUnlocked`
|
||||||
|
try keychain
|
||||||
|
.accessibility(.whenPasscodeSetThisDeviceOnly, authenticationPolicy: .userPresence)
|
||||||
|
.set("01234567-89ab-cdef-0123-456789abcdef", key: "kishikawakatsumi")
|
||||||
|
} catch let error {
|
||||||
|
// Error handling if needed...
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### :closed_lock_with_key: Updating a Touch ID protected item
|
||||||
|
|
||||||
|
The same way as when adding.
|
||||||
|
|
||||||
|
**Do not run in the main thread if there is a possibility that the item you are trying to add already exists, and protected.**
|
||||||
|
**Because updating protected items requires authentication.**
|
||||||
|
|
||||||
|
Additionally, you want to show custom authentication prompt message when updating, specify an `authenticationPrompt` attribute.
|
||||||
|
If the item not protected, the `authenticationPrompt` parameter just be ignored.
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
|
||||||
|
DispatchQueue.global().async {
|
||||||
|
do {
|
||||||
|
// Should be the secret invalidated when passcode is removed? If not then use `.WhenUnlocked`
|
||||||
|
try keychain
|
||||||
|
.accessibility(.whenPasscodeSetThisDeviceOnly, authenticationPolicy: .userPresence)
|
||||||
|
.authenticationPrompt("Authenticate to update your access token")
|
||||||
|
.set("01234567-89ab-cdef-0123-456789abcdef", key: "kishikawakatsumi")
|
||||||
|
} catch let error {
|
||||||
|
// Error handling if needed...
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### :closed_lock_with_key: Obtaining a Touch ID protected item
|
||||||
|
|
||||||
|
The same way as when you get a normal item. It will be displayed automatically Touch ID or passcode authentication If the item you try to get is protected.
|
||||||
|
If you want to show custom authentication prompt message, specify an `authenticationPrompt` attribute.
|
||||||
|
If the item not protected, the `authenticationPrompt` parameter just be ignored.
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
|
||||||
|
DispatchQueue.global().async {
|
||||||
|
do {
|
||||||
|
let password = try keychain
|
||||||
|
.authenticationPrompt("Authenticate to login to server")
|
||||||
|
.get("kishikawakatsumi")
|
||||||
|
|
||||||
|
print("password: \(password)")
|
||||||
|
} catch let error {
|
||||||
|
// Error handling if needed...
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### :closed_lock_with_key: Removing a Touch ID protected item
|
||||||
|
|
||||||
|
The same way as when you remove a normal item.
|
||||||
|
There is no way to show Touch ID or passcode authentication when removing Keychain items.
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(service: "com.example.github-token")
|
||||||
|
|
||||||
|
do {
|
||||||
|
try keychain.remove("kishikawakatsumi")
|
||||||
|
} catch let error {
|
||||||
|
// Error handling if needed...
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### <a name="shared_web_credentials"> :key: Shared Web Credentials
|
||||||
|
|
||||||
|
> Shared web credentials is a programming interface that enables native iOS apps to share credentials with their website counterparts. For example, a user may log in to a website in Safari, entering a user name and password, and save those credentials using the iCloud Keychain. Later, the user may run a native app from the same developer, and instead of the app requiring the user to reenter a user name and password, shared web credentials gives it access to the credentials that were entered earlier in Safari. The user can also create new accounts, update passwords, or delete her account from within the app. These changes are then saved and used by Safari.
|
||||||
|
<https://developer.apple.com/library/ios/documentation/Security/Reference/SharedWebCredentialsRef/>
|
||||||
|
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(server: "https://www.kishikawakatsumi.com", protocolType: .HTTPS)
|
||||||
|
|
||||||
|
let username = "kishikawakatsumi@mac.com"
|
||||||
|
|
||||||
|
// First, check the credential in the app's Keychain
|
||||||
|
if let password = try? keychain.get(username) {
|
||||||
|
// If found password in the Keychain,
|
||||||
|
// then log into the server
|
||||||
|
} else {
|
||||||
|
// If not found password in the Keychain,
|
||||||
|
// try to read from Shared Web Credentials
|
||||||
|
keychain.getSharedPassword(username) { (password, error) -> () in
|
||||||
|
if password != nil {
|
||||||
|
// If found password in the Shared Web Credentials,
|
||||||
|
// then log into the server
|
||||||
|
// and save the password to the Keychain
|
||||||
|
|
||||||
|
keychain[username] = password
|
||||||
|
} else {
|
||||||
|
// If not found password either in the Keychain also Shared Web Credentials,
|
||||||
|
// prompt for username and password
|
||||||
|
|
||||||
|
// Log into server
|
||||||
|
|
||||||
|
// If the login is successful,
|
||||||
|
// save the credentials to both the Keychain and the Shared Web Credentials.
|
||||||
|
|
||||||
|
keychain[username] = inputPassword
|
||||||
|
keychain.setSharedPassword(inputPassword, account: username)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Request all associated domain's credentials
|
||||||
|
|
||||||
|
```swift
|
||||||
|
Keychain.requestSharedWebCredential { (credentials, error) -> () in
|
||||||
|
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Generate strong random password
|
||||||
|
|
||||||
|
Generate strong random password that is in the same format used by Safari autofill (xxx-xxx-xxx-xxx).
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let password = Keychain.generatePassword() // => Nhu-GKm-s3n-pMx
|
||||||
|
```
|
||||||
|
|
||||||
|
#### How to set up Shared Web Credentials
|
||||||
|
|
||||||
|
> 1. Add a com.apple.developer.associated-domains entitlement to your app. This entitlement must include all the domains with which you want to share credentials.
|
||||||
|
|
||||||
|
> 2. Add an apple-app-site-association file to your website. This file must include application identifiers for all the apps with which the site wants to share credentials, and it must be properly signed.
|
||||||
|
|
||||||
|
> 3. When the app is installed, the system downloads and verifies the site association file for each of its associated domains. If the verification is successful, the app is associated with the domain.
|
||||||
|
|
||||||
|
**More details:**
|
||||||
|
<https://developer.apple.com/library/ios/documentation/Security/Reference/SharedWebCredentialsRef/>
|
||||||
|
|
||||||
|
### :key: Debugging
|
||||||
|
|
||||||
|
#### Display all stored items if print keychain object
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(server: "https://github.com", protocolType: .https)
|
||||||
|
print("\(keychain)")
|
||||||
|
```
|
||||||
|
|
||||||
|
```
|
||||||
|
=>
|
||||||
|
[
|
||||||
|
[authenticationType: default, key: kishikawakatsumi, server: github.com, class: internetPassword, protocol: https]
|
||||||
|
[authenticationType: default, key: hirohamada, server: github.com, class: internetPassword, protocol: https]
|
||||||
|
[authenticationType: default, key: honeylemon, server: github.com, class: internetPassword, protocol: https]
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Obtaining all stored keys
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(server: "https://github.com", protocolType: .https)
|
||||||
|
|
||||||
|
let keys = keychain.allKeys()
|
||||||
|
for key in keys {
|
||||||
|
print("key: \(key)")
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
```
|
||||||
|
=>
|
||||||
|
key: kishikawakatsumi
|
||||||
|
key: hirohamada
|
||||||
|
key: honeylemon
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Obtaining all stored items
|
||||||
|
|
||||||
|
```swift
|
||||||
|
let keychain = Keychain(server: "https://github.com", protocolType: .https)
|
||||||
|
|
||||||
|
let items = keychain.allItems()
|
||||||
|
for item in items {
|
||||||
|
print("item: \(item)")
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
```
|
||||||
|
=>
|
||||||
|
item: [authenticationType: Default, key: kishikawakatsumi, server: github.com, class: InternetPassword, protocol: https]
|
||||||
|
item: [authenticationType: Default, key: hirohamada, server: github.com, class: InternetPassword, protocol: https]
|
||||||
|
item: [authenticationType: Default, key: honeylemon, server: github.com, class: InternetPassword, protocol: https]
|
||||||
|
```
|
||||||
|
|
||||||
|
## Requirements
|
||||||
|
|
||||||
|
| | OS | Swift |
|
||||||
|
|------------|----------------------------------------|---------------|
|
||||||
|
| **v1.1.x** | iOS 7+, OSX 10.9+ | 1.1 |
|
||||||
|
| **v1.2.x** | iOS 7+, OSX 10.9+ | 1.2 |
|
||||||
|
| **v2.0.x** | iOS 7+, OSX 10.9+, watchOS 2+ | 2.0 |
|
||||||
|
| **v2.1.x** | iOS 7+, OSX 10.9+, watchOS 2+ | 2.0 |
|
||||||
|
| **v2.2.x** | iOS 8+, OSX 10.9+, watchOS 2+, tvOS 9+ | 2.0, 2.1 |
|
||||||
|
| **v2.3.x** | iOS 8+, OSX 10.9+, watchOS 2+, tvOS 9+ | 2.0, 2.1, 2.2 |
|
||||||
|
| **v2.4.x** | iOS 8+, OSX 10.9+, watchOS 2+, tvOS 9+ | 2.2, 2.3 |
|
||||||
|
| **v3.0.x** | iOS 8+, OSX 10.9+, watchOS 2+, tvOS 9+ | 3.x |
|
||||||
|
| **v3.1.x** | iOS 8+, OSX 10.9+, watchOS 2+, tvOS 9+ | 4.0, 4.1, 4.2 |
|
||||||
|
|
||||||
|
## Installation
|
||||||
|
|
||||||
|
### CocoaPods
|
||||||
|
|
||||||
|
KeychainAccess is available through [CocoaPods](http://cocoapods.org). To install
|
||||||
|
it, simply add the following lines to your Podfile:
|
||||||
|
|
||||||
|
```ruby
|
||||||
|
use_frameworks!
|
||||||
|
pod 'KeychainAccess'
|
||||||
|
```
|
||||||
|
|
||||||
|
### Carthage
|
||||||
|
|
||||||
|
KeychainAccess is available through [Carthage](https://github.com/Carthage/Carthage). To install
|
||||||
|
it, simply add the following line to your Cartfile:
|
||||||
|
|
||||||
|
`github "kishikawakatsumi/KeychainAccess"`
|
||||||
|
|
||||||
|
### Swift Package Manager
|
||||||
|
|
||||||
|
KeychainAccess is also available through [Swift Package Manager](https://github.com/apple/swift-package-manager/).
|
||||||
|
First, create `Package.swift` that its package declaration includes:
|
||||||
|
|
||||||
|
```swift
|
||||||
|
import PackageDescription
|
||||||
|
|
||||||
|
let package = Package(
|
||||||
|
dependencies: [
|
||||||
|
.Package(url: "https://github.com/kishikawakatsumi/KeychainAccess.git", majorVersion: 2)
|
||||||
|
]
|
||||||
|
)
|
||||||
|
```
|
||||||
|
|
||||||
|
Then, type
|
||||||
|
|
||||||
|
```shell
|
||||||
|
$ swift build
|
||||||
|
```
|
||||||
|
|
||||||
|
### To manually add to your project
|
||||||
|
|
||||||
|
1. Add `Lib/KeychainAccess.xcodeproj` to your project
|
||||||
|
2. Link `KeychainAccess.framework` with your target
|
||||||
|
3. Add `Copy Files Build Phase` to include the framework to your application bundle
|
||||||
|
|
||||||
|
_See [iOS Example Project](https://github.com/kishikawakatsumi/KeychainAccess/tree/master/Examples/Example-iOS) as reference._
|
||||||
|
|
||||||
|
<img src="https://raw.githubusercontent.com/kishikawakatsumi/KeychainAccess/master/Screenshots/Installation.png" width="800px" />
|
||||||
|
|
||||||
|
## Author
|
||||||
|
|
||||||
|
kishikawa katsumi, kishikawakatsumi@mac.com
|
||||||
|
|
||||||
|
## License
|
||||||
|
|
||||||
|
KeychainAccess is available under the MIT license. See the LICENSE file for more info.
|
||||||
12
Pods/Manifest.lock
generated
12
Pods/Manifest.lock
generated
@ -1,12 +1,20 @@
|
|||||||
PODS:
|
PODS:
|
||||||
- CryptoSwift (0.8.1)
|
- CryptoSwift (0.8.1)
|
||||||
|
- KeychainAccess (3.1.2)
|
||||||
|
|
||||||
DEPENDENCIES:
|
DEPENDENCIES:
|
||||||
- CryptoSwift
|
- CryptoSwift
|
||||||
|
- KeychainAccess
|
||||||
|
|
||||||
|
SPEC REPOS:
|
||||||
|
https://github.com/cocoapods/specs.git:
|
||||||
|
- CryptoSwift
|
||||||
|
- KeychainAccess
|
||||||
|
|
||||||
SPEC CHECKSUMS:
|
SPEC CHECKSUMS:
|
||||||
CryptoSwift: 4b07d5b508c1eb67bfa314a727b705f8048a85de
|
CryptoSwift: 4b07d5b508c1eb67bfa314a727b705f8048a85de
|
||||||
|
KeychainAccess: b3816fddcf28aa29d94b10ec305cd52be14c472b
|
||||||
|
|
||||||
PODFILE CHECKSUM: bbf4ad9f3f2f1429ecda282ecb446c084363a23f
|
PODFILE CHECKSUM: 2ccd80ba9984103c7eb7f1175a88d0a90df6c731
|
||||||
|
|
||||||
COCOAPODS: 1.3.1
|
COCOAPODS: 1.5.3
|
||||||
|
|||||||
1192
Pods/Pods.xcodeproj/project.pbxproj
generated
1192
Pods/Pods.xcodeproj/project.pbxproj
generated
File diff suppressed because it is too large
Load Diff
60
Pods/Pods.xcodeproj/xcuserdata/dawidkubicki.xcuserdatad/xcschemes/CryptoSwift.xcscheme
generated
Normal file
60
Pods/Pods.xcodeproj/xcuserdata/dawidkubicki.xcuserdatad/xcschemes/CryptoSwift.xcscheme
generated
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<Scheme
|
||||||
|
LastUpgradeVersion = "0930"
|
||||||
|
version = "1.3">
|
||||||
|
<BuildAction
|
||||||
|
parallelizeBuildables = "YES"
|
||||||
|
buildImplicitDependencies = "YES">
|
||||||
|
<BuildActionEntries>
|
||||||
|
<BuildActionEntry
|
||||||
|
buildForAnalyzing = "YES"
|
||||||
|
buildForTesting = "YES"
|
||||||
|
buildForRunning = "YES"
|
||||||
|
buildForProfiling = "YES"
|
||||||
|
buildForArchiving = "YES">
|
||||||
|
<BuildableReference
|
||||||
|
BuildableIdentifier = "primary"
|
||||||
|
BlueprintIdentifier = "16F79934C9B37C10283012C65CA992AB"
|
||||||
|
BlueprintName = "CryptoSwift"
|
||||||
|
ReferencedContainer = "container:Pods.xcodeproj"
|
||||||
|
BuildableName = "CryptoSwift.framework">
|
||||||
|
</BuildableReference>
|
||||||
|
</BuildActionEntry>
|
||||||
|
</BuildActionEntries>
|
||||||
|
</BuildAction>
|
||||||
|
<TestAction
|
||||||
|
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||||
|
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||||
|
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||||
|
buildConfiguration = "Debug">
|
||||||
|
<AdditionalOptions>
|
||||||
|
</AdditionalOptions>
|
||||||
|
</TestAction>
|
||||||
|
<LaunchAction
|
||||||
|
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||||
|
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||||
|
launchStyle = "0"
|
||||||
|
useCustomWorkingDirectory = "NO"
|
||||||
|
ignoresPersistentStateOnLaunch = "NO"
|
||||||
|
debugDocumentVersioning = "YES"
|
||||||
|
debugServiceExtension = "internal"
|
||||||
|
buildConfiguration = "Debug"
|
||||||
|
allowLocationSimulation = "YES">
|
||||||
|
<AdditionalOptions>
|
||||||
|
</AdditionalOptions>
|
||||||
|
</LaunchAction>
|
||||||
|
<ProfileAction
|
||||||
|
savedToolIdentifier = ""
|
||||||
|
useCustomWorkingDirectory = "NO"
|
||||||
|
debugDocumentVersioning = "YES"
|
||||||
|
buildConfiguration = "Release"
|
||||||
|
shouldUseLaunchSchemeArgsEnv = "YES">
|
||||||
|
</ProfileAction>
|
||||||
|
<AnalyzeAction
|
||||||
|
buildConfiguration = "Debug">
|
||||||
|
</AnalyzeAction>
|
||||||
|
<ArchiveAction
|
||||||
|
buildConfiguration = "Release"
|
||||||
|
revealArchiveInOrganizer = "YES">
|
||||||
|
</ArchiveAction>
|
||||||
|
</Scheme>
|
||||||
60
Pods/Pods.xcodeproj/xcuserdata/dawidkubicki.xcuserdatad/xcschemes/KeychainAccess.xcscheme
generated
Normal file
60
Pods/Pods.xcodeproj/xcuserdata/dawidkubicki.xcuserdatad/xcschemes/KeychainAccess.xcscheme
generated
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<Scheme
|
||||||
|
LastUpgradeVersion = "0930"
|
||||||
|
version = "1.3">
|
||||||
|
<BuildAction
|
||||||
|
parallelizeBuildables = "YES"
|
||||||
|
buildImplicitDependencies = "YES">
|
||||||
|
<BuildActionEntries>
|
||||||
|
<BuildActionEntry
|
||||||
|
buildForAnalyzing = "YES"
|
||||||
|
buildForTesting = "YES"
|
||||||
|
buildForRunning = "YES"
|
||||||
|
buildForProfiling = "YES"
|
||||||
|
buildForArchiving = "YES">
|
||||||
|
<BuildableReference
|
||||||
|
BuildableIdentifier = "primary"
|
||||||
|
BlueprintIdentifier = "1630C0AC0CCE2704C3F517D1DFD56586"
|
||||||
|
BlueprintName = "KeychainAccess"
|
||||||
|
ReferencedContainer = "container:Pods.xcodeproj"
|
||||||
|
BuildableName = "KeychainAccess.framework">
|
||||||
|
</BuildableReference>
|
||||||
|
</BuildActionEntry>
|
||||||
|
</BuildActionEntries>
|
||||||
|
</BuildAction>
|
||||||
|
<TestAction
|
||||||
|
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||||
|
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||||
|
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||||
|
buildConfiguration = "Debug">
|
||||||
|
<AdditionalOptions>
|
||||||
|
</AdditionalOptions>
|
||||||
|
</TestAction>
|
||||||
|
<LaunchAction
|
||||||
|
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||||
|
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||||
|
launchStyle = "0"
|
||||||
|
useCustomWorkingDirectory = "NO"
|
||||||
|
ignoresPersistentStateOnLaunch = "NO"
|
||||||
|
debugDocumentVersioning = "YES"
|
||||||
|
debugServiceExtension = "internal"
|
||||||
|
buildConfiguration = "Debug"
|
||||||
|
allowLocationSimulation = "YES">
|
||||||
|
<AdditionalOptions>
|
||||||
|
</AdditionalOptions>
|
||||||
|
</LaunchAction>
|
||||||
|
<ProfileAction
|
||||||
|
savedToolIdentifier = ""
|
||||||
|
useCustomWorkingDirectory = "NO"
|
||||||
|
debugDocumentVersioning = "YES"
|
||||||
|
buildConfiguration = "Release"
|
||||||
|
shouldUseLaunchSchemeArgsEnv = "YES">
|
||||||
|
</ProfileAction>
|
||||||
|
<AnalyzeAction
|
||||||
|
buildConfiguration = "Debug">
|
||||||
|
</AnalyzeAction>
|
||||||
|
<ArchiveAction
|
||||||
|
buildConfiguration = "Release"
|
||||||
|
revealArchiveInOrganizer = "YES">
|
||||||
|
</ArchiveAction>
|
||||||
|
</Scheme>
|
||||||
71
Pods/Pods.xcodeproj/xcuserdata/dawidkubicki.xcuserdatad/xcschemes/Pods-Friendvatars.xcscheme
generated
Normal file
71
Pods/Pods.xcodeproj/xcuserdata/dawidkubicki.xcuserdatad/xcschemes/Pods-Friendvatars.xcscheme
generated
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<Scheme
|
||||||
|
LastUpgradeVersion = "0930"
|
||||||
|
version = "1.3">
|
||||||
|
<BuildAction
|
||||||
|
parallelizeBuildables = "YES"
|
||||||
|
buildImplicitDependencies = "YES">
|
||||||
|
<BuildActionEntries>
|
||||||
|
<BuildActionEntry
|
||||||
|
buildForTesting = "YES"
|
||||||
|
buildForRunning = "YES"
|
||||||
|
buildForProfiling = "YES"
|
||||||
|
buildForArchiving = "YES"
|
||||||
|
buildForAnalyzing = "YES">
|
||||||
|
<BuildableReference
|
||||||
|
BuildableIdentifier = "primary"
|
||||||
|
BlueprintIdentifier = "93927B2E03466C85C8B18A3BA96CAE46"
|
||||||
|
BuildableName = "Pods_Friendvatars.framework"
|
||||||
|
BlueprintName = "Pods-Friendvatars"
|
||||||
|
ReferencedContainer = "container:Pods.xcodeproj">
|
||||||
|
</BuildableReference>
|
||||||
|
</BuildActionEntry>
|
||||||
|
</BuildActionEntries>
|
||||||
|
</BuildAction>
|
||||||
|
<TestAction
|
||||||
|
buildConfiguration = "Debug"
|
||||||
|
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||||
|
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||||
|
shouldUseLaunchSchemeArgsEnv = "YES">
|
||||||
|
<Testables>
|
||||||
|
</Testables>
|
||||||
|
<AdditionalOptions>
|
||||||
|
</AdditionalOptions>
|
||||||
|
</TestAction>
|
||||||
|
<LaunchAction
|
||||||
|
buildConfiguration = "Debug"
|
||||||
|
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||||
|
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||||
|
launchStyle = "0"
|
||||||
|
useCustomWorkingDirectory = "NO"
|
||||||
|
ignoresPersistentStateOnLaunch = "NO"
|
||||||
|
debugDocumentVersioning = "YES"
|
||||||
|
debugServiceExtension = "internal"
|
||||||
|
allowLocationSimulation = "YES">
|
||||||
|
<MacroExpansion>
|
||||||
|
<BuildableReference
|
||||||
|
BuildableIdentifier = "primary"
|
||||||
|
BlueprintIdentifier = "93927B2E03466C85C8B18A3BA96CAE46"
|
||||||
|
BuildableName = "Pods_Friendvatars.framework"
|
||||||
|
BlueprintName = "Pods-Friendvatars"
|
||||||
|
ReferencedContainer = "container:Pods.xcodeproj">
|
||||||
|
</BuildableReference>
|
||||||
|
</MacroExpansion>
|
||||||
|
<AdditionalOptions>
|
||||||
|
</AdditionalOptions>
|
||||||
|
</LaunchAction>
|
||||||
|
<ProfileAction
|
||||||
|
buildConfiguration = "Release"
|
||||||
|
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||||
|
savedToolIdentifier = ""
|
||||||
|
useCustomWorkingDirectory = "NO"
|
||||||
|
debugDocumentVersioning = "YES">
|
||||||
|
</ProfileAction>
|
||||||
|
<AnalyzeAction
|
||||||
|
buildConfiguration = "Debug">
|
||||||
|
</AnalyzeAction>
|
||||||
|
<ArchiveAction
|
||||||
|
buildConfiguration = "Release"
|
||||||
|
revealArchiveInOrganizer = "YES">
|
||||||
|
</ArchiveAction>
|
||||||
|
</Scheme>
|
||||||
@ -4,16 +4,33 @@
|
|||||||
<dict>
|
<dict>
|
||||||
<key>SchemeUserState</key>
|
<key>SchemeUserState</key>
|
||||||
<dict>
|
<dict>
|
||||||
|
<key>CryptoSwift.xcscheme</key>
|
||||||
|
<dict>
|
||||||
|
<key>isShown</key>
|
||||||
|
<false/>
|
||||||
|
</dict>
|
||||||
<key>CryptoSwift.xcscheme_^#shared#^_</key>
|
<key>CryptoSwift.xcscheme_^#shared#^_</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>orderHint</key>
|
<key>orderHint</key>
|
||||||
<integer>1</integer>
|
<integer>0</integer>
|
||||||
|
</dict>
|
||||||
|
<key>KeychainAccess.xcscheme</key>
|
||||||
|
<dict>
|
||||||
|
<key>isShown</key>
|
||||||
|
<false/>
|
||||||
|
</dict>
|
||||||
|
<key>Pods-Friendvatars.xcscheme</key>
|
||||||
|
<dict>
|
||||||
|
<key>isShown</key>
|
||||||
|
<false/>
|
||||||
</dict>
|
</dict>
|
||||||
<key>Pods-Friendvatars.xcscheme_^#shared#^_</key>
|
<key>Pods-Friendvatars.xcscheme_^#shared#^_</key>
|
||||||
<dict>
|
<dict>
|
||||||
<key>orderHint</key>
|
<key>orderHint</key>
|
||||||
<integer>2</integer>
|
<integer>1</integer>
|
||||||
</dict>
|
</dict>
|
||||||
</dict>
|
</dict>
|
||||||
|
<key>SuppressBuildableAutocreation</key>
|
||||||
|
<dict/>
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
|
|||||||
@ -1,10 +1,9 @@
|
|||||||
CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/CryptoSwift
|
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift
|
||||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
||||||
GCC_UNROLL_LOOPS = YES
|
GCC_UNROLL_LOOPS = YES
|
||||||
HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Public"
|
|
||||||
OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
|
OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
|
||||||
PODS_BUILD_DIR = $BUILD_DIR
|
PODS_BUILD_DIR = ${BUILD_DIR}
|
||||||
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
|
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
|
||||||
PODS_ROOT = ${SRCROOT}
|
PODS_ROOT = ${SRCROOT}
|
||||||
PODS_TARGET_SRCROOT = ${PODS_ROOT}/CryptoSwift
|
PODS_TARGET_SRCROOT = ${PODS_ROOT}/CryptoSwift
|
||||||
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
|
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
|
||||||
|
|||||||
26
Pods/Target Support Files/KeychainAccess/Info.plist
generated
Normal file
26
Pods/Target Support Files/KeychainAccess/Info.plist
generated
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>CFBundleDevelopmentRegion</key>
|
||||||
|
<string>en</string>
|
||||||
|
<key>CFBundleExecutable</key>
|
||||||
|
<string>${EXECUTABLE_NAME}</string>
|
||||||
|
<key>CFBundleIdentifier</key>
|
||||||
|
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
|
||||||
|
<key>CFBundleInfoDictionaryVersion</key>
|
||||||
|
<string>6.0</string>
|
||||||
|
<key>CFBundleName</key>
|
||||||
|
<string>${PRODUCT_NAME}</string>
|
||||||
|
<key>CFBundlePackageType</key>
|
||||||
|
<string>FMWK</string>
|
||||||
|
<key>CFBundleShortVersionString</key>
|
||||||
|
<string>3.1.2</string>
|
||||||
|
<key>CFBundleSignature</key>
|
||||||
|
<string>????</string>
|
||||||
|
<key>CFBundleVersion</key>
|
||||||
|
<string>${CURRENT_PROJECT_VERSION}</string>
|
||||||
|
<key>NSPrincipalClass</key>
|
||||||
|
<string></string>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
||||||
5
Pods/Target Support Files/KeychainAccess/KeychainAccess-dummy.m
generated
Normal file
5
Pods/Target Support Files/KeychainAccess/KeychainAccess-dummy.m
generated
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
#import <Foundation/Foundation.h>
|
||||||
|
@interface PodsDummy_KeychainAccess : NSObject
|
||||||
|
@end
|
||||||
|
@implementation PodsDummy_KeychainAccess
|
||||||
|
@end
|
||||||
12
Pods/Target Support Files/KeychainAccess/KeychainAccess-prefix.pch
generated
Normal file
12
Pods/Target Support Files/KeychainAccess/KeychainAccess-prefix.pch
generated
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
#ifdef __OBJC__
|
||||||
|
#import <UIKit/UIKit.h>
|
||||||
|
#else
|
||||||
|
#ifndef FOUNDATION_EXPORT
|
||||||
|
#if defined(__cplusplus)
|
||||||
|
#define FOUNDATION_EXPORT extern "C"
|
||||||
|
#else
|
||||||
|
#define FOUNDATION_EXPORT extern
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
16
Pods/Target Support Files/KeychainAccess/KeychainAccess-umbrella.h
generated
Normal file
16
Pods/Target Support Files/KeychainAccess/KeychainAccess-umbrella.h
generated
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
#ifdef __OBJC__
|
||||||
|
#import <UIKit/UIKit.h>
|
||||||
|
#else
|
||||||
|
#ifndef FOUNDATION_EXPORT
|
||||||
|
#if defined(__cplusplus)
|
||||||
|
#define FOUNDATION_EXPORT extern "C"
|
||||||
|
#else
|
||||||
|
#define FOUNDATION_EXPORT extern
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
FOUNDATION_EXPORT double KeychainAccessVersionNumber;
|
||||||
|
FOUNDATION_EXPORT const unsigned char KeychainAccessVersionString[];
|
||||||
|
|
||||||
6
Pods/Target Support Files/KeychainAccess/KeychainAccess.modulemap
generated
Normal file
6
Pods/Target Support Files/KeychainAccess/KeychainAccess.modulemap
generated
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
framework module KeychainAccess {
|
||||||
|
umbrella header "KeychainAccess-umbrella.h"
|
||||||
|
|
||||||
|
export *
|
||||||
|
module * { export * }
|
||||||
|
}
|
||||||
9
Pods/Target Support Files/KeychainAccess/KeychainAccess.xcconfig
generated
Normal file
9
Pods/Target Support Files/KeychainAccess/KeychainAccess.xcconfig
generated
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
CONFIGURATION_BUILD_DIR = ${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess
|
||||||
|
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
||||||
|
OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
|
||||||
|
PODS_BUILD_DIR = ${BUILD_DIR}
|
||||||
|
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
|
||||||
|
PODS_ROOT = ${SRCROOT}
|
||||||
|
PODS_TARGET_SRCROOT = ${PODS_ROOT}/KeychainAccess
|
||||||
|
PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier}
|
||||||
|
SKIP_INSTALL = YES
|
||||||
@ -14,4 +14,30 @@ Permission is granted to anyone to use this software for any purpose,including c
|
|||||||
- Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
|
- Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
|
||||||
- This notice may not be removed or altered from any source or binary distribution.
|
- This notice may not be removed or altered from any source or binary distribution.
|
||||||
|
|
||||||
|
|
||||||
|
## KeychainAccess
|
||||||
|
|
||||||
|
The MIT License (MIT)
|
||||||
|
|
||||||
|
Copyright (c) 2014 kishikawa katsumi
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
|
||||||
|
|
||||||
Generated by CocoaPods - https://cocoapods.org
|
Generated by CocoaPods - https://cocoapods.org
|
||||||
|
|||||||
@ -32,6 +32,38 @@ Permission is granted to anyone to use this software for any purpose,including c
|
|||||||
<key>Type</key>
|
<key>Type</key>
|
||||||
<string>PSGroupSpecifier</string>
|
<string>PSGroupSpecifier</string>
|
||||||
</dict>
|
</dict>
|
||||||
|
<dict>
|
||||||
|
<key>FooterText</key>
|
||||||
|
<string>The MIT License (MIT)
|
||||||
|
|
||||||
|
Copyright (c) 2014 kishikawa katsumi
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
|
||||||
|
</string>
|
||||||
|
<key>License</key>
|
||||||
|
<string>MIT</string>
|
||||||
|
<key>Title</key>
|
||||||
|
<string>KeychainAccess</string>
|
||||||
|
<key>Type</key>
|
||||||
|
<string>PSGroupSpecifier</string>
|
||||||
|
</dict>
|
||||||
<dict>
|
<dict>
|
||||||
<key>FooterText</key>
|
<key>FooterText</key>
|
||||||
<string>Generated by CocoaPods - https://cocoapods.org</string>
|
<string>Generated by CocoaPods - https://cocoapods.org</string>
|
||||||
|
|||||||
@ -1,15 +1,28 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -e
|
set -e
|
||||||
|
set -u
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
|
if [ -z ${FRAMEWORKS_FOLDER_PATH+x} ]; then
|
||||||
|
# If FRAMEWORKS_FOLDER_PATH is not set, then there's nowhere for us to copy
|
||||||
|
# frameworks to, so exit 0 (signalling the script phase was successful).
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
|
echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
|
||||||
mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
|
mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}"
|
||||||
|
|
||||||
|
COCOAPODS_PARALLEL_CODE_SIGN="${COCOAPODS_PARALLEL_CODE_SIGN:-false}"
|
||||||
SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
|
SWIFT_STDLIB_PATH="${DT_TOOLCHAIN_DIR}/usr/lib/swift/${PLATFORM_NAME}"
|
||||||
|
|
||||||
|
# Used as a return value for each invocation of `strip_invalid_archs` function.
|
||||||
|
STRIP_BINARY_RETVAL=0
|
||||||
|
|
||||||
# This protects against multiple targets copying the same framework dependency at the same time. The solution
|
# This protects against multiple targets copying the same framework dependency at the same time. The solution
|
||||||
# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
|
# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
|
||||||
RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
|
RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
|
||||||
|
|
||||||
|
# Copies and strips a vendored framework
|
||||||
install_framework()
|
install_framework()
|
||||||
{
|
{
|
||||||
if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
|
if [ -r "${BUILT_PRODUCTS_DIR}/$1" ]; then
|
||||||
@ -58,21 +71,40 @@ install_framework()
|
|||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Copies the dSYM of a vendored framework
|
# Copies and strips a vendored dSYM
|
||||||
install_dsym() {
|
install_dsym() {
|
||||||
local source="$1"
|
local source="$1"
|
||||||
if [ -r "$source" ]; then
|
if [ -r "$source" ]; then
|
||||||
echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DWARF_DSYM_FOLDER_PATH}\""
|
# Copy the dSYM into a the targets temp dir.
|
||||||
rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DWARF_DSYM_FOLDER_PATH}"
|
echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${source}\" \"${DERIVED_FILES_DIR}\""
|
||||||
|
rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${source}" "${DERIVED_FILES_DIR}"
|
||||||
|
|
||||||
|
local basename
|
||||||
|
basename="$(basename -s .framework.dSYM "$source")"
|
||||||
|
binary="${DERIVED_FILES_DIR}/${basename}.framework.dSYM/Contents/Resources/DWARF/${basename}"
|
||||||
|
|
||||||
|
# Strip invalid architectures so "fat" simulator / device frameworks work on device
|
||||||
|
if [[ "$(file "$binary")" == *"Mach-O dSYM companion"* ]]; then
|
||||||
|
strip_invalid_archs "$binary"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $STRIP_BINARY_RETVAL == 1 ]]; then
|
||||||
|
# Move the stripped file into its final destination.
|
||||||
|
echo "rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter \"- CVS/\" --filter \"- .svn/\" --filter \"- .git/\" --filter \"- .hg/\" --filter \"- Headers\" --filter \"- PrivateHeaders\" --filter \"- Modules\" \"${DERIVED_FILES_DIR}/${basename}.framework.dSYM\" \"${DWARF_DSYM_FOLDER_PATH}\""
|
||||||
|
rsync --delete -av "${RSYNC_PROTECT_TMP_FILES[@]}" --filter "- CVS/" --filter "- .svn/" --filter "- .git/" --filter "- .hg/" --filter "- Headers" --filter "- PrivateHeaders" --filter "- Modules" "${DERIVED_FILES_DIR}/${basename}.framework.dSYM" "${DWARF_DSYM_FOLDER_PATH}"
|
||||||
|
else
|
||||||
|
# The dSYM was not stripped at all, in this case touch a fake folder so the input/output paths from Xcode do not reexecute this script because the file is missing.
|
||||||
|
touch "${DWARF_DSYM_FOLDER_PATH}/${basename}.framework.dSYM"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Signs a framework with the provided identity
|
# Signs a framework with the provided identity
|
||||||
code_sign_if_enabled() {
|
code_sign_if_enabled() {
|
||||||
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
|
if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED:-}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then
|
||||||
# Use the current code_sign_identitiy
|
# Use the current code_sign_identitiy
|
||||||
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
|
echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}"
|
||||||
local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements '$1'"
|
local code_sign_cmd="/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS:-} --preserve-metadata=identifier,entitlements '$1'"
|
||||||
|
|
||||||
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
|
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
|
||||||
code_sign_cmd="$code_sign_cmd &"
|
code_sign_cmd="$code_sign_cmd &"
|
||||||
@ -85,10 +117,18 @@ code_sign_if_enabled() {
|
|||||||
# Strip invalid architectures
|
# Strip invalid architectures
|
||||||
strip_invalid_archs() {
|
strip_invalid_archs() {
|
||||||
binary="$1"
|
binary="$1"
|
||||||
# Get architectures for current file
|
# Get architectures for current target binary
|
||||||
archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | rev)"
|
binary_archs="$(lipo -info "$binary" | rev | cut -d ':' -f1 | awk '{$1=$1;print}' | rev)"
|
||||||
|
# Intersect them with the architectures we are building for
|
||||||
|
intersected_archs="$(echo ${ARCHS[@]} ${binary_archs[@]} | tr ' ' '\n' | sort | uniq -d)"
|
||||||
|
# If there are no archs supported by this binary then warn the user
|
||||||
|
if [[ -z "$intersected_archs" ]]; then
|
||||||
|
echo "warning: [CP] Vendored binary '$binary' contains architectures ($binary_archs) none of which match the current build architectures ($ARCHS)."
|
||||||
|
STRIP_BINARY_RETVAL=0
|
||||||
|
return
|
||||||
|
fi
|
||||||
stripped=""
|
stripped=""
|
||||||
for arch in $archs; do
|
for arch in $binary_archs; do
|
||||||
if ! [[ "${ARCHS}" == *"$arch"* ]]; then
|
if ! [[ "${ARCHS}" == *"$arch"* ]]; then
|
||||||
# Strip non-valid architectures in-place
|
# Strip non-valid architectures in-place
|
||||||
lipo -remove "$arch" -output "$binary" "$binary" || exit 1
|
lipo -remove "$arch" -output "$binary" "$binary" || exit 1
|
||||||
@ -98,14 +138,17 @@ strip_invalid_archs() {
|
|||||||
if [[ "$stripped" ]]; then
|
if [[ "$stripped" ]]; then
|
||||||
echo "Stripped $binary of architectures:$stripped"
|
echo "Stripped $binary of architectures:$stripped"
|
||||||
fi
|
fi
|
||||||
|
STRIP_BINARY_RETVAL=1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if [[ "$CONFIGURATION" == "Debug" ]]; then
|
if [[ "$CONFIGURATION" == "Debug" ]]; then
|
||||||
install_framework "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework"
|
install_framework "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework"
|
||||||
|
install_framework "${BUILT_PRODUCTS_DIR}/KeychainAccess/KeychainAccess.framework"
|
||||||
fi
|
fi
|
||||||
if [[ "$CONFIGURATION" == "Release" ]]; then
|
if [[ "$CONFIGURATION" == "Release" ]]; then
|
||||||
install_framework "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework"
|
install_framework "${BUILT_PRODUCTS_DIR}/CryptoSwift/CryptoSwift.framework"
|
||||||
|
install_framework "${BUILT_PRODUCTS_DIR}/KeychainAccess/KeychainAccess.framework"
|
||||||
fi
|
fi
|
||||||
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
|
if [ "${COCOAPODS_PARALLEL_CODE_SIGN}" == "true" ]; then
|
||||||
wait
|
wait
|
||||||
|
|||||||
@ -1,5 +1,13 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -e
|
set -e
|
||||||
|
set -u
|
||||||
|
set -o pipefail
|
||||||
|
|
||||||
|
if [ -z ${UNLOCALIZED_RESOURCES_FOLDER_PATH+x} ]; then
|
||||||
|
# If UNLOCALIZED_RESOURCES_FOLDER_PATH is not set, then there's nowhere for us to copy
|
||||||
|
# resources to, so exit 0 (signalling the script phase was successful).
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
|
mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
|
||||||
|
|
||||||
@ -12,7 +20,7 @@ XCASSET_FILES=()
|
|||||||
# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
|
# was originally proposed here: https://lists.samba.org/archive/rsync/2008-February/020158.html
|
||||||
RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
|
RSYNC_PROTECT_TMP_FILES=(--filter "P .*.??????")
|
||||||
|
|
||||||
case "${TARGETED_DEVICE_FAMILY}" in
|
case "${TARGETED_DEVICE_FAMILY:-}" in
|
||||||
1,2)
|
1,2)
|
||||||
TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
|
TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone"
|
||||||
;;
|
;;
|
||||||
@ -92,7 +100,7 @@ if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then
|
|||||||
fi
|
fi
|
||||||
rm -f "$RESOURCES_TO_COPY"
|
rm -f "$RESOURCES_TO_COPY"
|
||||||
|
|
||||||
if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ]
|
if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "${XCASSET_FILES:-}" ]
|
||||||
then
|
then
|
||||||
# Find all other xcassets (this unfortunately includes those of path pods and other targets).
|
# Find all other xcassets (this unfortunately includes those of path pods and other targets).
|
||||||
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
|
OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d)
|
||||||
@ -102,5 +110,9 @@ then
|
|||||||
fi
|
fi
|
||||||
done <<<"$OTHER_XCASSETS"
|
done <<<"$OTHER_XCASSETS"
|
||||||
|
|
||||||
|
if [ -z ${ASSETCATALOG_COMPILER_APPICON_NAME+x} ]; then
|
||||||
printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
|
printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}"
|
||||||
|
else
|
||||||
|
printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" --app-icon "${ASSETCATALOG_COMPILER_APPICON_NAME}" --output-partial-info-plist "${TARGET_TEMP_DIR}/assetcatalog_generated_info_cocoapods.plist"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
|
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
|
||||||
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/CryptoSwift"
|
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" "${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess"
|
||||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
||||||
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
|
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
|
||||||
OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/CryptoSwift/CryptoSwift.framework/Headers"
|
OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess/KeychainAccess.framework/Headers"
|
||||||
OTHER_LDFLAGS = $(inherited) -framework "CryptoSwift"
|
OTHER_LDFLAGS = $(inherited) -framework "CryptoSwift" -framework "KeychainAccess"
|
||||||
OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
|
OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
|
||||||
PODS_BUILD_DIR = $BUILD_DIR
|
PODS_BUILD_DIR = ${BUILD_DIR}
|
||||||
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
|
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
|
||||||
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
|
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
|
||||||
PODS_ROOT = ${SRCROOT}/Pods
|
PODS_ROOT = ${SRCROOT}/Pods
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
|
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES
|
||||||
FRAMEWORK_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/CryptoSwift"
|
FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift" "${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess"
|
||||||
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1
|
||||||
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
|
LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks'
|
||||||
OTHER_CFLAGS = $(inherited) -iquote "$PODS_CONFIGURATION_BUILD_DIR/CryptoSwift/CryptoSwift.framework/Headers"
|
OTHER_CFLAGS = $(inherited) -iquote "${PODS_CONFIGURATION_BUILD_DIR}/CryptoSwift/CryptoSwift.framework/Headers" -iquote "${PODS_CONFIGURATION_BUILD_DIR}/KeychainAccess/KeychainAccess.framework/Headers"
|
||||||
OTHER_LDFLAGS = $(inherited) -framework "CryptoSwift"
|
OTHER_LDFLAGS = $(inherited) -framework "CryptoSwift" -framework "KeychainAccess"
|
||||||
OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
|
OTHER_SWIFT_FLAGS = $(inherited) "-D" "COCOAPODS"
|
||||||
PODS_BUILD_DIR = $BUILD_DIR
|
PODS_BUILD_DIR = ${BUILD_DIR}
|
||||||
PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
|
PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)
|
||||||
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
|
PODS_PODFILE_DIR_PATH = ${SRCROOT}/.
|
||||||
PODS_ROOT = ${SRCROOT}/Pods
|
PODS_ROOT = ${SRCROOT}/Pods
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user