ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-02-15 07:19:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up appIdentifier and keychain servicename to be defined only once

Browse Source
This commit is contained in:
Andreas Linde
2013-09-23 15:22:37 +02:00
parent 341f407eb0
commit 1a3a5cb2e6
3 changed files with 31 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Classes/BITHockeyBaseManager.m
View File

@@ -97,7 +97,7 @@
}
- (NSString *)encodedAppIdentifier {
return (_appIdentifier ? bit_URLEncodedString(_appIdentifier) : bit_URLEncodedString([self mainBundleIdentifier]));
return bit_encodeAppIdentifier(_appIdentifier);
}
- (BOOL)isPreiOS7Environment {
@@ -259,42 +259,44 @@
if (!key || !stringValue)
return NO;
NSString *serviceName = [NSString stringWithFormat:@"%@.HockeySDK", [self mainBundleIdentifier]];
NSError *error = nil;
return [BITKeychainUtils storeUsername:key andPassword:stringValue forServiceName:serviceName updateExisting:YES error:&error];
return [BITKeychainUtils storeUsername:key
andPassword:stringValue
forServiceName:bit_keychainHockeySDKServiceName()
updateExisting:YES
error:&error];
}
- (BOOL)addStringValueToKeychainForThisDeviceOnly:(NSString *)stringValue forKey:(NSString *)key {
if (!key || !stringValue)
return NO;
NSString *serviceName = [NSString stringWithFormat:@"%@.HockeySDK", [self mainBundleIdentifier]];
NSError *error = nil;
return [BITKeychainUtils storeUsername:key andPassword:stringValue forServiceName:serviceName updateExisting:YES accessibility:kSecAttrAccessibleWhenUnlockedThisDeviceOnly error:&error];
return [BITKeychainUtils storeUsername:key
andPassword:stringValue
forServiceName:bit_keychainHockeySDKServiceName()
updateExisting:YES
accessibility:kSecAttrAccessibleWhenUnlockedThisDeviceOnly
error:&error];
}
- (NSString *)stringValueFromKeychainForKey:(NSString *)key {
if (!key)
return nil;
NSString *serviceName = [NSString stringWithFormat:@"%@.HockeySDK", [self mainBundleIdentifier]];
NSError *error = nil;
return [BITKeychainUtils getPasswordForUsername:key andServiceName:serviceName error:&error];
return [BITKeychainUtils getPasswordForUsername:key
andServiceName:bit_keychainHockeySDKServiceName()
error:&error];
}
- (BOOL)removeKeyFromKeychain:(NSString *)key {
NSString *serviceName = [NSString stringWithFormat:@"%@.HockeySDK", [self mainBundleIdentifier]];
NSError *error = nil;
return [BITKeychainUtils deleteItemForUsername:key andServiceName:serviceName error:&error];
return [BITKeychainUtils deleteItemForUsername:key
andServiceName:bit_keychainHockeySDKServiceName()
error:&error];
}
- (NSString*) mainBundleIdentifier {
return [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"];
}
#pragma mark - Manager Control

3
Classes/BITHockeyHelper.h
View File

@@ -34,7 +34,10 @@ NSString *bit_URLEncodedString(NSString *inputString);
NSString *bit_URLDecodedString(NSString *inputString);
NSString *bit_base64String(NSData * data, unsigned long length);
NSString *bit_keychainHockeySDKServiceName(void);
NSComparisonResult bit_versionCompare(NSString *stringA, NSString *stringB);
NSString *bit_mainBundleIdentifier(void);
NSString *bit_encodeAppIdentifier(NSString *inputString);
NSString *bit_appName(NSString *placeHolderString);
NSString *bit_appAnonID(void);

11
Classes/BITHockeyHelper.m
View File

@@ -113,6 +113,11 @@ NSString *bit_base64String(NSData * data, unsigned long length) {
return result;
}
NSString *bit_keychainHockeySDKServiceName(void) {
NSString *serviceName = [NSString stringWithFormat:@"%@.HockeySDK", bit_mainBundleIdentifier()];
return serviceName;
}
NSComparisonResult bit_versionCompare(NSString *stringA, NSString *stringB) {
// Extract plain version number from self
NSString *plainSelf = stringA;
@@ -137,8 +142,12 @@ NSComparisonResult bit_versionCompare(NSString *stringA, NSString *stringB) {
return result;
}
NSString *bit_mainBundleIdentifier(void) {
return [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"];
}
NSString *bit_encodeAppIdentifier(NSString *inputString) {
return (inputString ? bit_URLEncodedString(inputString) : bit_URLEncodedString([[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleIdentifier"]));
return (inputString ? bit_URLEncodedString(inputString) : bit_URLEncodedString(bit_mainBundleIdentifier()));
}
NSString *bit_appName(NSString *placeHolderString) {