Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Return mutable versions instead of immutable versions. #19

Closed
wants to merge 1 commit into from
Closed

Return mutable versions instead of immutable versions. #19

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

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 6 additions & 6 deletions Lib/UICKeyChainStore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@
- (instancetype)initWithService:(NSString *)service;
- (instancetype)initWithService:(NSString *)service accessGroup:(NSString *)accessGroup;

+ (NSString *)stringForKey:(NSString *)key;
+ (NSString *)stringForKey:(NSString *)key service:(NSString *)service;
+ (NSString *)stringForKey:(NSString *)key service:(NSString *)service accessGroup:(NSString *)accessGroup;
+ (NSMutableString *)stringForKey:(NSString *)key;
+ (NSMutableString *)stringForKey:(NSString *)key service:(NSString *)service;
+ (NSMutableString *)stringForKey:(NSString *)key service:(NSString *)service accessGroup:(NSString *)accessGroup;
+ (BOOL)setString:(NSString *)value forKey:(NSString *)key;
+ (BOOL)setString:(NSString *)value forKey:(NSString *)key service:(NSString *)service;
+ (BOOL)setString:(NSString *)value forKey:(NSString *)key service:(NSString *)service accessGroup:(NSString *)accessGroup;

+ (NSData *)dataForKey:(NSString *)key;
+ (NSData *)dataForKey:(NSString *)key service:(NSString *)service;
+ (NSData *)dataForKey:(NSString *)key service:(NSString *)service accessGroup:(NSString *)accessGroup;
+ (NSMutableData *)dataForKey:(NSString *)key;
+ (NSMutableData *)dataForKey:(NSString *)key service:(NSString *)service;
+ (NSMutableData *)dataForKey:(NSString *)key service:(NSString *)service accessGroup:(NSString *)accessGroup;
+ (BOOL)setData:(NSData *)data forKey:(NSString *)key;
+ (BOOL)setData:(NSData *)data forKey:(NSString *)key service:(NSString *)service;
+ (BOOL)setData:(NSData *)data forKey:(NSString *)key service:(NSString *)service accessGroup:(NSString *)accessGroup;
Expand Down
21 changes: 9 additions & 12 deletions Lib/UICKeyChainStore.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,21 +77,21 @@ - (instancetype)initWithService:(NSString *)service accessGroup:(NSString *)acce

#pragma mark -

+ (NSString *)stringForKey:(NSString *)key
+ (NSMutableString *)stringForKey:(NSString *)key
{
return [self stringForKey:key service:[self defaultService] accessGroup:nil];
}

+ (NSString *)stringForKey:(NSString *)key service:(NSString *)service
+ (NSMutableString *)stringForKey:(NSString *)key service:(NSString *)service
{
return [self stringForKey:key service:service accessGroup:nil];
}

+ (NSString *)stringForKey:(NSString *)key service:(NSString *)service accessGroup:(NSString *)accessGroup
+ (NSMutableString *)stringForKey:(NSString *)key service:(NSString *)service accessGroup:(NSString *)accessGroup
{
NSData *data = [self dataForKey:key service:service accessGroup:accessGroup];
NSMutableData *data = [self dataForKey:key service:service accessGroup:accessGroup];
if (data) {
return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
return [[NSMutableString alloc] initWithData:data encoding:NSUTF8StringEncoding];
}

return nil;
Expand All @@ -115,17 +115,17 @@ + (BOOL)setString:(NSString *)value forKey:(NSString *)key service:(NSString *)s

#pragma mark -

+ (NSData *)dataForKey:(NSString *)key
+ (NSMutableData *)dataForKey:(NSString *)key
{
return [self dataForKey:key service:[self defaultService] accessGroup:nil];
}

+ (NSData *)dataForKey:(NSString *)key service:(NSString *)service
+ (NSMutableData *)dataForKey:(NSString *)key service:(NSString *)service
{
return [self dataForKey:key service:service accessGroup:nil];
}

+ (NSData *)dataForKey:(NSString *)key service:(NSString *)service accessGroup:(NSString *)accessGroup
+ (NSMutableData *)dataForKey:(NSString *)key service:(NSString *)service accessGroup:(NSString *)accessGroup
{
if (!key) {
return nil;
Expand Down Expand Up @@ -153,10 +153,7 @@ + (NSData *)dataForKey:(NSString *)key service:(NSString *)service accessGroup:(
return nil;
}

NSData *ret = [NSData dataWithData:(__bridge NSData *)data];
if (data) {
CFRelease(data);
}
NSMutableData *ret = (__bridge_transfer NSMutableData *)data;

return ret;
}
Expand Down