aboutsummaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authorRoman Margold <rmargold@chromium.org>2017-02-01 16:26:29 -0800
committerRoman Margold <rmargold@chromium.org>2017-02-01 16:26:29 -0800
commit2c4c039118a15d54231c4764873dce54941bfe94 (patch)
tree0589550ce92cfdb0797a73c18d10250be90432a5 /src/client
parentiOS client identifies itself via URL params (diff)
downloadbreakpad-2c4c039118a15d54231c4764873dce54941bfe94.tar.xz
Revert "iOS client identifies itself via URL params"
This reverts commit 262a3f50fe5948c2570bbce2cd696e253a88af79.
Diffstat (limited to 'src/client')
-rw-r--r--src/client/mac/sender/uploader.mm37
1 files changed, 0 insertions, 37 deletions
diff --git a/src/client/mac/sender/uploader.mm b/src/client/mac/sender/uploader.mm
index b6a8a846..42a43bfc 100644
--- a/src/client/mac/sender/uploader.mm
+++ b/src/client/mac/sender/uploader.mm
@@ -168,10 +168,6 @@ 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
@@ -536,41 +532,8 @@ NSDictionary *readConfigurationData(const char *configFile) {
}
//=============================================================================
-- (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 Crash @ Google, add URL params which identify the product
- NSURLComponents *urlComponents = [NSURLComponents componentsWithURL:url
- resolvingAgainstBaseURL:false];
- NSMutableArray *queryItemsToAdd = [urlComponents.queryItems mutableCopyWithZone:nil];
- 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];