diff options
| author | Jason Wray <jason@mapbox.com> | 2019-04-26 17:52:19 -0700 |
|---|---|---|
| committer | Jason Wray <jason@mapbox.com> | 2019-04-30 10:38:43 -0700 |
| commit | a51e3856d7d12576df2d0584a9b8a52b0241cb8f (patch) | |
| tree | 9f943cee50097b4b48525d2a1e7cc4e03493a5b2 | |
| parent | 1b5c728c1c6a41c3bd195aa2be26c597b7b85fb0 (diff) | |
| download | qtlocation-mapboxgl-a51e3856d7d12576df2d0584a9b8a52b0241cb8f.tar.gz | |
[ios] Remove events=true from new SKU requestsupstream/friedbunny-cherry-picks-14540-to-mojito
| -rw-r--r-- | platform/darwin/src/http_file_source.mm | 15 | ||||
| -rw-r--r-- | platform/ios/app/Info.plist | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm index c4b18ffd3c..26f6149b3f 100644 --- a/platform/darwin/src/http_file_source.mm +++ b/platform/darwin/src/http_file_source.mm @@ -208,20 +208,17 @@ std::unique_ptr<AsyncRequest> HTTPFileSource::request(const Resource& resource, if (impl->accountType == 0 && ([url.host isEqualToString:@"mapbox.com"] || [url.host hasSuffix:@".mapbox.com"])) { NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO]; - - NSMutableArray *newQueryItems = [NSMutableArray arrayWithArray:@[ - [NSURLQueryItem queryItemWithName:@"events" value:@"true"] - ]]; + NSURLQueryItem *accountsQueryItem = nil; // Only add the token if we have enabled the accounts SDK - if (MGLAccountManager.isAccountsSDKEnabled) - { + if (MGLAccountManager.isAccountsSDKEnabled) { NSCAssert(MGLAccountManager.skuToken, @"skuToken should be non-nil if the accounts SDK is enabled"); - [newQueryItems addObject:[NSURLQueryItem queryItemWithName:@"sku" value:MGLAccountManager.skuToken]]; + accountsQueryItem = [NSURLQueryItem queryItemWithName:@"sku" value:MGLAccountManager.skuToken]; + } else { + accountsQueryItem = [NSURLQueryItem queryItemWithName:@"events" value:@"true"]; } - components.queryItems = components.queryItems ? [components.queryItems arrayByAddingObjectsFromArray:newQueryItems] : newQueryItems; - + components.queryItems = components.queryItems ? [components.queryItems arrayByAddingObject:accountsQueryItem] : @[accountsQueryItem]; url = components.URL; } #endif diff --git a/platform/ios/app/Info.plist b/platform/ios/app/Info.plist index e2f294a5a5..a30b62a862 100644 --- a/platform/ios/app/Info.plist +++ b/platform/ios/app/Info.plist @@ -66,5 +66,7 @@ <string>settings</string> </dict> </array> + <key>MGLMapboxAccountsSDKEnabled</key> + <true/> </dict> </plist> |