[core] [android] - public api configurable base endpoint (#6309)

add runloop to test

2 files changed, 21 insertions, 5 deletions

diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp
index 9465728509..83674cea03 100644
--- a/platform/default/default_file_source.cpp
+++ b/platform/default/default_file_source.cpp
@@ -28,6 +28,14 @@ public:
     Impl(const std::string& cachePath, uint64_t maximumCacheSize)
         : offlineDatabase(cachePath, maximumCacheSize) {
     }
+    
+    void setAPIBaseURL(const std::string& url) {
+        onlineFileSource.setAPIBaseURL(url);
+    }
+    
+    std::string getAPIBaseURL() const{
+        return onlineFileSource.getAPIBaseURL();
+    }
 
     void setAccessToken(const std::string& accessToken) {
         onlineFileSource.setAccessToken(accessToken);
@@ -151,6 +159,14 @@ DefaultFileSource::DefaultFileSource(const std::string& cachePath,
 
 DefaultFileSource::~DefaultFileSource() = default;
 
+void DefaultFileSource::setAPIBaseURL(const std::string& baseURL) {
+    thread->invokeSync(&Impl::setAPIBaseURL, baseURL);
+}
+    
+std::string DefaultFileSource::getAPIBaseURL() const {
+    return thread->invokeSync(&Impl::getAPIBaseURL);
+}
+    
 void DefaultFileSource::setAccessToken(const std::string& accessToken) {
     thread->invokeSync(&Impl::setAccessToken, accessToken);
 }
diff --git a/platform/default/online_file_source.cpp b/platform/default/online_file_source.cpp
index 44245b9c13..049cbf5f8d 100644
--- a/platform/default/online_file_source.cpp
+++ b/platform/default/online_file_source.cpp
@@ -160,24 +160,24 @@ std::unique_ptr<AsyncRequest> OnlineFileSource::request(const Resource& resource
         break;
 
     case Resource::Kind::Style:
-        res.url = mbgl::util::mapbox::normalizeStyleURL(resource.url, accessToken);
+        res.url = mbgl::util::mapbox::normalizeStyleURL(apiBaseURL, resource.url, accessToken);
         break;
 
     case Resource::Kind::Source:
-        res.url = util::mapbox::normalizeSourceURL(resource.url, accessToken);
+        res.url = util::mapbox::normalizeSourceURL(apiBaseURL, resource.url, accessToken);
         break;
 
     case Resource::Kind::Glyphs:
-        res.url = util::mapbox::normalizeGlyphsURL(resource.url, accessToken);
+        res.url = util::mapbox::normalizeGlyphsURL(apiBaseURL, resource.url, accessToken);
         break;
 
     case Resource::Kind::SpriteImage:
     case Resource::Kind::SpriteJSON:
-        res.url = util::mapbox::normalizeSpriteURL(resource.url, accessToken);
+        res.url = util::mapbox::normalizeSpriteURL(apiBaseURL, resource.url, accessToken);
         break;
 
     case Resource::Kind::Tile:
-        res.url = util::mapbox::normalizeTileURL(resource.url, accessToken);
+        res.url = util::mapbox::normalizeTileURL(apiBaseURL, resource.url, accessToken);
         break;
     }