tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[ios, macos] Include SKU token for offline requests (#16130)" (#16193)

Browse Source 
* Revert "[ios, macos] Include SKU token for offline requests (#16130) (#16133)"

This reverts commit d85ce77deba12167f1c25a911ef81f44e35daa2a.

* [ios] Keep skipping docs for ios-release
This commit is contained in:
Jordan Kiley
2020-02-19 15:10:50 -08:00
committed by GitHub
parent d01c6aa322
commit e27055ff21
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/darwin/src/http_file_source.mm
View File

@@ -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];

5
platform/darwin/test/MGLResourceTests.mm
View File

@@ -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) {