Update context accessors

Only create getter/setter for context field which value wont be nil
This commit is contained in:
Christoph Wendt
2015-09-08 18:12:33 -07:00
parent 7594f654c8
commit d9f172e3cd
2 changed files with 24 additions and 80 deletions

View File

@@ -112,25 +112,9 @@ FOUNDATION_EXPORT NSString *const kBITApplicationWasLaunched;
- (void)setAppVersion:(NSString *)appVersion;
- (NSString *)userId;
- (NSString *)anonymousUserId;
- (void)setUserId:(NSString *)userId;
- (NSString *)userAcquisitionDate;
- (void)setUserAcquisitionDate:(NSString *)userAcqusitionDate;
- (NSString *)accountId;
- (void)setAccountId:(NSString *)accountId;
- (NSString *)authenticatedUserId;
- (void)setAuthenticatedUserId:(NSString *)authenticatedUserId;
- (NSString *)authenticatedUserAcquisitionDate;
- (void)setAuthenticatedUserAcquisitionDate:(NSString *)authenticatedUserAcquisitionDate;
- (void)setAnonymousUserId:(NSString *)anonymous;
- (NSString *)anonymousUserAquisitionDate;
@@ -172,6 +156,10 @@ FOUNDATION_EXPORT NSString *const kBITApplicationWasLaunched;
- (void)setOsLocale:(NSString *)osLocale;
- (NSString *)osLanguage;
- (void)setOsLanguage:(NSString *)osLanguage;
- (NSString *)deviceId;
- (void)setDeviceId:(NSString *)deviceId;

View File

@@ -156,7 +156,7 @@ static char *const BITContextOperationsQueue = "net.hockeyapp.telemetryContextQu
});
}
- (NSString *)userId {
- (NSString *)anonymousUserId {
__block NSString *tmp;
dispatch_sync(_operationsQueue, ^{
tmp = _user.userId;
@@ -164,73 +164,13 @@ static char *const BITContextOperationsQueue = "net.hockeyapp.telemetryContextQu
return tmp;
}
- (void)setUserId:(NSString *)userId {
- (void)setAnonymousUserId:(NSString *)userId {
NSString* tmp = [userId copy];
dispatch_barrier_async(_operationsQueue, ^{
_user.userId = tmp;
});
}
- (NSString *)userAcquisitionDate {
__block NSString *tmp;
dispatch_sync(_operationsQueue, ^{
tmp = _user.accountAcquisitionDate;
});
return tmp;
}
- (void)setUserAcquisitionDate:(NSString *)userAcqusitionDate {
NSString* tmp = [userAcqusitionDate copy];
dispatch_barrier_async(_operationsQueue, ^{
_user.accountAcquisitionDate = tmp;
});
}
- (NSString *)accountId {
__block NSString *tmp;
dispatch_sync(_operationsQueue, ^{
tmp = _user.accountId;
});
return tmp;
}
- (void)setAccountId:(NSString *)accountId {
NSString* tmp = [accountId copy];
dispatch_barrier_async(_operationsQueue, ^{
_user.accountId = tmp;
});
}
- (NSString *)authenticatedUserId {
__block NSString *tmp;
dispatch_sync(_operationsQueue, ^{
tmp = _user.authUserId;
});
return tmp;
}
- (void)setAuthenticatedUserId:(NSString *)authenticatedUserId {
NSString* tmp = [authenticatedUserId copy];
dispatch_barrier_async(_operationsQueue, ^{
_user.authUserId = tmp;
});
}
- (NSString *)authenticatedUserAcquisitionDate {
__block NSString *tmp;
dispatch_sync(_operationsQueue, ^{
tmp = _user.authUserAcquisitionDate;
});
return tmp;
}
- (void)setAuthenticatedUserAcquisitionDate:(NSString *)authenticatedUserAcquisitionDate {
NSString* tmp = [authenticatedUserAcquisitionDate copy];
dispatch_barrier_async(_operationsQueue, ^{
_user.authUserAcquisitionDate = tmp;
});
}
- (NSString *)anonymousUserAquisitionDate {
__block NSString *tmp;
dispatch_sync(_operationsQueue, ^{
@@ -381,6 +321,21 @@ static char *const BITContextOperationsQueue = "net.hockeyapp.telemetryContextQu
});
}
- (NSString *)osLanguage {
__block NSString *tmp;
dispatch_sync(_operationsQueue, ^{
tmp = _device.language;
});
return tmp;
}
- (void)setOsLanguage:(NSString *)osLanguage {
NSString* tmp = [osLanguage copy];
dispatch_barrier_async(_operationsQueue, ^{
_device.language = tmp;
});
}
- (NSString *)deviceId {
__block NSString *tmp;
dispatch_sync(_operationsQueue, ^{
@@ -434,6 +389,7 @@ static char *const BITContextOperationsQueue = "net.hockeyapp.telemetryContextQu
[contextDictionary addEntriesFromDictionary:self.tags];
[contextDictionary addEntriesFromDictionary:[self.session serializeToDictionary]];
[contextDictionary addEntriesFromDictionary:[self.user serializeToDictionary]];
// TODO: Only update networkType rather than all device context values
[contextDictionary addEntriesFromDictionary:[self.device serializeToDictionary]];
return contextDictionary;