[ios] Refactor host checks (#15948)

1 files changed, 9 insertions, 2 deletions

diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm
index b0f69f4a7f..dbf92aa462 100644
--- a/platform/darwin/src/http_file_source.mm
+++ b/platform/darwin/src/http_file_source.mm
@@ -196,13 +196,20 @@ HTTPFileSource::HTTPFileSource()
 HTTPFileSource::~HTTPFileSource() = default;
 
 MGL_EXPORT
+BOOL isValidMapboxEndpoint(NSURL *url) {
+    return ([url.host isEqualToString:@"mapbox.com"] ||
+            [url.host hasSuffix:@".mapbox.com"] ||
+            [url.host isEqualToString:@"mapbox.cn"] ||
+            [url.host hasSuffix:@".mapbox.cn"]);
+}
+
+MGL_EXPORT
 NSURL *resourceURLWithAccountType(const Resource& resource, NSInteger accountType) {
     
     NSURL *url = [NSURL URLWithString:@(resource.url.c_str())];
     
 #if TARGET_OS_IPHONE || TARGET_OS_SIMULATOR
-    if (accountType == 0 &&
-        ([url.host isEqualToString:@"mapbox.com"] || [url.host hasSuffix:@".mapbox.com"])) {
+    if (accountType == 0 && isValidMapboxEndpoint(url)) {
         NSURLComponents *components = [NSURLComponents componentsWithURL:url resolvingAgainstBaseURL:NO];
         NSMutableArray *queryItems = [NSMutableArray array];