diff options
| author | Tobrun <tobrun@mapbox.com> | 2017-05-12 20:07:06 +0200 |
|---|---|---|
| committer | Antonio Zugaldia <antonio@mapbox.com> | 2017-05-12 14:07:06 -0400 |
| commit | a68788a2cfb85efe69b0d81672bff7272368494e (patch) | |
| tree | 3df7a3e646fd7dc6af26f3f817c0dcf4fa48e696 /platform/default | |
| parent | 886bf2528ff1615a50521e75fc6ea211cef3b8d7 (diff) | |
| download | qtlocation-mapboxgl-a68788a2cfb85efe69b0d81672bff7272368494e.tar.gz | |
[android] Release android-v5.1.0-beta.2 (#8976)
* [android] url getter on sources
* [android] fix ui test filter in makefile
* [android] - build SNAPSHOT from release branch (#8958)
* [android] - update changelog for 5.1.0-beta.2
* [android] - bump version number
* [android] - Camera change listener v2.0
* [core] allow filesource url transform reset
* [android] Update attribution wordmark (#8774)
* Update wordmark on android
* Moved attribution i icon to the right of mapbox word (in mapview preview image)
* update padding and margin
* [android] update hardcoded branch name
* revert version to 5.1.0-SNAPSHOT
Diffstat (limited to 'platform/default')
| -rw-r--r-- | platform/default/default_file_source.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/platform/default/default_file_source.cpp b/platform/default/default_file_source.cpp index 27c3950e2a..7db0b85461 100644 --- a/platform/default/default_file_source.cpp +++ b/platform/default/default_file_source.cpp @@ -200,12 +200,16 @@ std::string DefaultFileSource::getAccessToken() const { } void DefaultFileSource::setResourceTransform(std::function<std::string(Resource::Kind, std::string&&)> transform) { - auto loop = util::RunLoop::Get(); - thread->invoke(&Impl::setResourceTransform, [loop, transform](Resource::Kind kind_, std::string&& url_, auto callback_) { - return loop->invokeWithCallback([transform](Resource::Kind kind, std::string&& url, auto callback) { - callback(transform(kind, std::move(url))); - }, kind_, std::move(url_), callback_); - }); + if (transform) { + auto loop = util::RunLoop::Get(); + thread->invoke(&Impl::setResourceTransform, [loop, transform](Resource::Kind kind_, std::string&& url_, auto callback_) { + return loop->invokeWithCallback([transform](Resource::Kind kind, std::string&& url, auto callback) { + callback(transform(kind, std::move(url))); + }, kind_, std::move(url_), callback_); + }); + } else { + thread->invoke(&Impl::setResourceTransform, nullptr); + } } std::unique_ptr<AsyncRequest> DefaultFileSource::request(const Resource& resource, Callback callback) { |