mirror of
https://github.com/yuzu-emu/breakpad.git
synced 2024-11-27 22:54:22 +01:00
iOS client identifies itself via URL params
For iOS apps, product and version information is now automatically provided as part of the crash report upload URL to allow for early rejections. Change-Id: Ia19c490c38023f9e23ec8a537f7a203ff1e642d7 Reviewed-on: https://chromium-review.googlesource.com/436164 Reviewed-by: Roman Margold <rmargold@chromium.org> Reviewed-by: Joshua Peraza <jperaza@chromium.org>
This commit is contained in:
parent
a784e84497
commit
dac2223398
@ -168,6 +168,12 @@ NSDictionary *readConfigurationData(const char *configFile) {
|
||||
|
||||
// Records the uploaded crash ID to the log file.
|
||||
- (void)logUploadWithID:(const char *)uploadID;
|
||||
|
||||
// Builds an URL parameter for a given dictionary key. Uses Uploader's
|
||||
// parameters to provide its value. Returns nil if no item is stored for the
|
||||
// given key.
|
||||
- (NSURLQueryItem *)queryItemWithName:(NSString *)queryItemName
|
||||
forParamKey:(NSString *)key;
|
||||
@end
|
||||
|
||||
@implementation Uploader
|
||||
@ -531,9 +537,47 @@ NSDictionary *readConfigurationData(const char *configFile) {
|
||||
[result release];
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
- (NSURLQueryItem *)queryItemWithName:(NSString *)queryItemName
|
||||
forParamKey:(NSString *)key {
|
||||
NSString *value = [parameters_ objectForKey:key];
|
||||
NSString *escapedValue =
|
||||
[value stringByAddingPercentEncodingWithAllowedCharacters:
|
||||
[NSCharacterSet URLQueryAllowedCharacterSet]];
|
||||
return [NSURLQueryItem queryItemWithName:queryItemName value:escapedValue];
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
- (void)report {
|
||||
NSURL *url = [NSURL URLWithString:[parameters_ objectForKey:@BREAKPAD_URL]];
|
||||
|
||||
NSString *serverType = [parameters_ objectForKey:@BREAKPAD_SERVER_TYPE];
|
||||
if ([serverType length] == 0 ||
|
||||
[serverType isEqualToString:kGoogleServerType]) {
|
||||
// when communicating to Google's crash collecting service, add URL params
|
||||
// which identify the product
|
||||
NSURLComponents *urlComponents = [NSURLComponents componentsWithURL:url
|
||||
resolvingAgainstBaseURL:false];
|
||||
NSMutableArray *queryItemsToAdd = [urlComponents.queryItems mutableCopy];
|
||||
if (queryItemsToAdd == nil) {
|
||||
queryItemsToAdd = [[NSMutableArray alloc] init];
|
||||
}
|
||||
|
||||
NSURLQueryItem *queryItemProduct =
|
||||
[self queryItemWithName:@"product" forParamKey:@BREAKPAD_PRODUCT];
|
||||
NSURLQueryItem *queryItemVersion =
|
||||
[self queryItemWithName:@"version" forParamKey:@BREAKPAD_VERSION];
|
||||
NSURLQueryItem *queryItemGuid =
|
||||
[self queryItemWithName:@"guid" forParamKey:@"guid"];
|
||||
|
||||
if (queryItemProduct != nil) [queryItemsToAdd addObject:queryItemProduct];
|
||||
if (queryItemVersion != nil) [queryItemsToAdd addObject:queryItemVersion];
|
||||
if (queryItemGuid != nil) [queryItemsToAdd addObject:queryItemGuid];
|
||||
|
||||
urlComponents.queryItems = queryItemsToAdd;
|
||||
url = [urlComponents URL];
|
||||
}
|
||||
|
||||
HTTPMultipartUpload *upload = [[HTTPMultipartUpload alloc] initWithURL:url];
|
||||
NSMutableDictionary *uploadParameters = [NSMutableDictionary dictionary];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user