From c4aa728f77c423a5070f2a733d1738c04c3021bf Mon Sep 17 00:00:00 2001 From: jmkiley Date: Wed, 29 Apr 2020 18:48:03 -0700 Subject: [darwin] remove accountType check --- platform/darwin/src/http_file_source.mm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm index c69abccff9..b8ec501d57 100644 --- a/platform/darwin/src/http_file_source.mm +++ b/platform/darwin/src/http_file_source.mm @@ -93,7 +93,6 @@ public: NSURLSession* session = nil; NSString* userAgent = nil; - NSInteger accountType = 0; private: NSString* getUserAgent() const; @@ -196,12 +195,11 @@ BOOL isValidMapboxEndpoint(NSURL *url) { } MGL_APPLE_EXPORT -NSURL *resourceURLWithAccountType(const Resource& resource, NSInteger accountType) { +NSURL *resourceURL(const Resource& resource) { NSURL *url = [NSURL URLWithString:@(resource.url.c_str())]; - -#if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR - if (accountType == 0 && isValidMapboxEndpoint(url)) { + + if (isValidMapboxEndpoint(url)) { NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO]; NSMutableArray *queryItems = [NSMutableArray array]; @@ -219,9 +217,6 @@ NSURL *resourceURLWithAccountType(const Resource& resource, NSInteger accountTyp components.queryItems = queryItems; url = components.URL; } -#else - (void)accountType; -#endif return url; } @@ -230,7 +225,7 @@ std::unique_ptr HTTPFileSource::request(const Resource& resource, auto shared = request->shared; // Explicit copy so that it also gets copied into the completion handler block below. @autoreleasepool { - NSURL *url = resourceURLWithAccountType(resource, impl->accountType); + NSURL *url = resourceURL(resource); [MGLNativeNetworkManager.sharedManager debugLog:@"Requesting URI: %@", url.relativePath]; NSMutableURLRequest *req = [NSMutableURLRequest requestWithURL:url]; -- cgit v1.2.1