diff options
| author | Jordan Kiley <jmkiley@users.noreply.github.com> | 2020-01-21 13:35:57 -0800 |
|---|---|---|
| committer | jmkiley <jordan.kiley@mapbox.com> | 2020-01-21 13:37:15 -0800 |
| commit | f00c5ec4dc5c4a70c177f5c23bfd446308663de0 (patch) | |
| tree | 0b85de9105cf3db73b3dccf04bc010e479aaeaf4 | |
| parent | 6dc435f66465eff76e730053d80efae90fa249c5 (diff) | |
| download | qtlocation-mapboxgl-upstream/jmkiley-cp-sku.tar.gz | |
[ios, macos] Include SKU token for offline requests (#16130)upstream/jmkiley-cp-sku
| -rw-r--r-- | circle.yml | 2 | ||||
| -rw-r--r-- | platform/darwin/src/http_file_source.mm | 5 | ||||
| -rw-r--r-- | platform/darwin/test/MGLResourceTests.mm | 5 |
3 files changed, 5 insertions, 7 deletions
diff --git a/circle.yml b/circle.yml index 7aa497708c..0e2f4c3fb5 100644 --- a/circle.yml +++ b/circle.yml @@ -1219,7 +1219,7 @@ jobs: - install-ios-packaging-dependencies - run: name: Build dynamic framework for device and simulator - command: make iframework + command: make iframework BUILD_DOCS=false no_output_timeout: 5m - deploy: name: Upload snapshot build to s3 diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm index a72a97e299..6132ba7f9b 100644 --- a/platform/darwin/src/http_file_source.mm +++ b/platform/darwin/src/http_file_source.mm @@ -207,10 +207,9 @@ 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 7fcccc535c..cf6a997cea 100644 --- a/platform/darwin/test/MGLResourceTests.mm +++ b/platform/darwin/test/MGLResourceTests.mm @@ -60,13 +60,12 @@ 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:@"b"] && [item.value isEqualToString:@"two"]) || [item.name isEqualToString:@"sku"]) { foundCount++; } - XCTAssertFalse([item.name isEqualToString:@"sku"]); } - XCTAssert(foundCount == 3); + XCTAssert(foundCount == 4); #else // NOTE: Currently the macOS SDK does not supply the sku or offline query parameters for (NSURLQueryItem *item in components.queryItems) { |