diff options
| author | Jordan Kiley <jmkiley@users.noreply.github.com> | 2020-02-11 13:46:36 -0800 |
|---|---|---|
| committer | jmkiley <jordan.kiley@mapbox.com> | 2020-02-19 13:59:36 -0800 |
| commit | bb7c88479ab372cc38e6c46d6ac6d664c8c47284 (patch) | |
| tree | 41770cf812f75c820c970ecfc2c7adf963d0b240 | |
| parent | d01c6aa322d096229ec122fa64bb71ededf6dfdb (diff) | |
| download | qtlocation-mapboxgl-upstream/jmkiley-revert-16130.tar.gz | |
Revert "[ios, macos] Include SKU token for offline requests (#16130)" (#16191)upstream/jmkiley-revert-16130
* Revert "[ios, macos] Include SKU token for offline requests (#16130) (#16133)"
This reverts commit d85ce77deba12167f1c25a911ef81f44e35daa2a.
* [ios] Keep skipping docs for ios-release
| -rw-r--r-- | platform/darwin/src/http_file_source.mm | 5 | ||||
| -rw-r--r-- | platform/darwin/test/MGLResourceTests.mm | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm index 6132ba7f9b..a72a97e299 100644 --- a/platform/darwin/src/http_file_source.mm +++ b/platform/darwin/src/http_file_source.mm @@ -207,9 +207,10 @@ NSURL *resourceURLWithAccountType(const Resource& resource, NSInteger accountTyp if (resource.usage == Resource::Usage::Offline) { [queryItems addObject:[NSURLQueryItem queryItemWithName:@"offline" value:@"true"]]; + } else { + // Only add SKU token to requests not tagged as "offline" usage. + [queryItems addObject:[NSURLQueryItem queryItemWithName:@"sku" value:MGLNativeNetworkManager.sharedManager.skuToken]]; } - - [queryItems addObject:[NSURLQueryItem queryItemWithName:@"sku" value:MGLNativeNetworkManager.sharedManager.skuToken]]; if (components.queryItems) { [queryItems addObjectsFromArray:components.queryItems]; diff --git a/platform/darwin/test/MGLResourceTests.mm b/platform/darwin/test/MGLResourceTests.mm index cf6a997cea..7fcccc535c 100644 --- a/platform/darwin/test/MGLResourceTests.mm +++ b/platform/darwin/test/MGLResourceTests.mm @@ -60,12 +60,13 @@ namespace mbgl { for (NSURLQueryItem *item in components.queryItems) { if (([item.name isEqualToString:@"offline"] && [item.value isEqualToString:@"true"]) || ([item.name isEqualToString:@"a"] && [item.value isEqualToString:@"one"]) || - ([item.name isEqualToString:@"b"] && [item.value isEqualToString:@"two"]) || [item.name isEqualToString:@"sku"]) { + ([item.name isEqualToString:@"b"] && [item.value isEqualToString:@"two"])) { foundCount++; } + XCTAssertFalse([item.name isEqualToString:@"sku"]); } - XCTAssert(foundCount == 4); + XCTAssert(foundCount == 3); #else // NOTE: Currently the macOS SDK does not supply the sku or offline query parameters for (NSURLQueryItem *item in components.queryItems) { |