Skip to content

Commit 285370d

Browse files
committed
Updated to version 1.5.3
1 parent 874b998 commit 285370d

File tree

7 files changed

+14
-28
lines changed

7 files changed

+14
-28
lines changed

Examples/Basic Example/FXKeychainExample.xcodeproj/project.pbxproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
0113D967168F011600BAAE7F /* FXKeychainExample-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "FXKeychainExample-Info.plist"; sourceTree = "<group>"; };
3131
0113D969168F011600BAAE7F /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
3232
0113D96B168F011600BAAE7F /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
33-
0113D96D168F011600BAAE7F /* FXKeychainExample-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "FXKeychainExample-Prefix.pch"; sourceTree = "<group>"; };
3433
0113D96E168F011600BAAE7F /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
3534
0113D96F168F011600BAAE7F /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
3635
0113D971168F011600BAAE7F /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
@@ -40,7 +39,7 @@
4039
0113D978168F011600BAAE7F /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
4140
0113D97B168F011600BAAE7F /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/ViewController.xib; sourceTree = "<group>"; };
4241
0113D983168F013F00BAAE7F /* FXKeychain.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FXKeychain.h; sourceTree = "<group>"; };
43-
0113D984168F013F00BAAE7F /* FXKeychain.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FXKeychain.m; sourceTree = "<group>"; };
42+
0113D984168F013F00BAAE7F /* FXKeychain.m */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.objc; path = FXKeychain.m; sourceTree = "<group>"; tabWidth = 4; };
4443
0113D98A168F14D000BAAE7F /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; };
4544
/* End PBXFileReference section */
4645

@@ -67,7 +66,9 @@
6766
0113D95E168F011600BAAE7F /* Frameworks */,
6867
0113D95C168F011600BAAE7F /* Products */,
6968
);
69+
indentWidth = 4;
7070
sourceTree = "<group>";
71+
tabWidth = 4;
7172
};
7273
0113D95C168F011600BAAE7F /* Products */ = {
7374
isa = PBXGroup;
@@ -107,7 +108,6 @@
107108
0113D967168F011600BAAE7F /* FXKeychainExample-Info.plist */,
108109
0113D968168F011600BAAE7F /* InfoPlist.strings */,
109110
0113D96B168F011600BAAE7F /* main.m */,
110-
0113D96D168F011600BAAE7F /* FXKeychainExample-Prefix.pch */,
111111
0113D971168F011600BAAE7F /* Default.png */,
112112
0113D973168F011600BAAE7F /* [email protected] */,
113113
0113D975168F011600BAAE7F /* [email protected] */,
@@ -360,7 +360,6 @@
360360
isa = XCBuildConfiguration;
361361
buildSettings = {
362362
GCC_PRECOMPILE_PREFIX_HEADER = YES;
363-
GCC_PREFIX_HEADER = "FXKeychainExample/FXKeychainExample-Prefix.pch";
364363
INFOPLIST_FILE = "FXKeychainExample/FXKeychainExample-Info.plist";
365364
PRODUCT_NAME = "$(TARGET_NAME)";
366365
WRAPPER_EXTENSION = app;
@@ -371,7 +370,6 @@
371370
isa = XCBuildConfiguration;
372371
buildSettings = {
373372
GCC_PRECOMPILE_PREFIX_HEADER = YES;
374-
GCC_PREFIX_HEADER = "FXKeychainExample/FXKeychainExample-Prefix.pch";
375373
INFOPLIST_FILE = "FXKeychainExample/FXKeychainExample-Info.plist";
376374
PRODUCT_NAME = "$(TARGET_NAME)";
377375
WRAPPER_EXTENSION = app;

Examples/Basic Example/FXKeychainExample/FXKeychainExample-Prefix.pch

Lines changed: 0 additions & 14 deletions
This file was deleted.

FXKeychain.podspec.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "FXKeychain",
3-
"version": "1.5.2",
3+
"version": "1.5.3",
44
"license": "zlib",
55
"summary": "FXKeychain is a lightweight wrapper around the Apple keychain APIs that provides a simple dictionary-like interface.",
66
"homepage": "https://github.com/nicklockwood/FXKeychain",
77
"authors": "Nick Lockwood",
88
"social_media_url": "https://twitter.com/nicklockwood",
99
"source": {
1010
"git": "https://github.com/nicklockwood/FXKeychain.git",
11-
"tag": "1.5.2"
11+
"tag": "1.5.3"
1212
},
1313
"source_files": "FXKeychain/FXKeychain.{h,m}",
1414
"requires_arc": true,

FXKeychain/FXKeychain.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// FXKeychain.h
33
//
4-
// Version 1.5.2
4+
// Version 1.5.3
55
//
66
// Created by Nick Lockwood on 29/12/2012.
77
// Copyright 2012 Charcoal Design

FXKeychain/FXKeychain.m

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//
22
// FXKeychain.m
33
//
4-
// Version 1.5.2
4+
// Version 1.5.3
55
//
66
// Created by Nick Lockwood on 29/12/2012.
77
// Copyright 2012 Charcoal Design
@@ -139,7 +139,7 @@ - (id)initWithService:(NSString *)service
139139

140140
- (NSData *)dataForKey:(id)key
141141
{
142-
//generate query
142+
//generate query
143143
NSMutableDictionary *query = [NSMutableDictionary dictionary];
144144
if ([self.service length]) query[(__bridge NSString *)kSecAttrService] = self.service;
145145
query[(__bridge NSString *)kSecClass] = (__bridge id)kSecClassGenericPassword;
@@ -165,8 +165,6 @@ - (NSData *)dataForKey:(id)key
165165

166166
- (BOOL)setObject:(id)object forKey:(id)key
167167
{
168-
NSParameterAssert(key);
169-
170168
//generate query
171169
NSMutableDictionary *query = [NSMutableDictionary dictionary];
172170
if ([self.service length]) query[(__bridge NSString *)kSecAttrService] = self.service;
@@ -306,7 +304,7 @@ - (id)objectForKey:(id)key
306304
format:&format
307305
error:&error];
308306

309-
if ([object respondsToSelector:@selector(objectForKey:)] && [object objectForKey:@"$archiver"])
307+
if ([object respondsToSelector:@selector(objectForKey:)] && [(NSDictionary *)object objectForKey:@"$archiver"])
310308
{
311309
//data represents an NSCoded archive
312310

LICENCE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FXKeychain
22

3-
Version 1.5.2, October 13th, 2014
3+
Version 1.5.3, May 22nd, 2015
44

55
Copyright (C) 2012 Charcoal Design
66

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,10 @@ These values behave the same way as their non-ThisDeviceOnly counterparts, excep
122122
Release Notes
123123
----------------
124124

125+
Version 1.5.3
126+
127+
- Fixed crash when stored value is an array
128+
125129
Version 1.5.2
126130

127131
- Fixed issue on iOS 8 that may have caused crashes and made accessGroup not work correctly

0 commit comments

Comments
 (0)