summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2020-04-23 19:49:20 -0700
committerMinh Nguyễn <mxn@1ec5.org>2020-04-24 10:27:29 -0700
commitcb3d9eab498210c35870d1548cdcda9372e34404 (patch)
treebaa59c289e34c63e8bc3822c1a7eadd205d3bcdb
parent3542db4fd41ca466b0d29657246f4cddf77d8e9f (diff)
downloadqtlocation-mapboxgl-cb3d9eab498210c35870d1548cdcda9372e34404.tar.gz
[ios, macos] Fixed receiving local file URL response
-rw-r--r--CHANGELOG.md4
-rw-r--r--platform/darwin/src/http_file_source.mm2
2 files changed, 6 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f12eb1e287..823a47415f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,10 @@
By default, the source is not volatile.
+### Bug fixes
+
+- [ios, macos] Fixed error receiving local file URL response ([#16428](https://github.com/mapbox/mapbox-gl-native/pull/16428))
+
## maps-v1.6.0-rc.1
### ✨ New features
diff --git a/platform/darwin/src/http_file_source.mm b/platform/darwin/src/http_file_source.mm
index 1b5a67ea5d..c69abccff9 100644
--- a/platform/darwin/src/http_file_source.mm
+++ b/platform/darwin/src/http_file_source.mm
@@ -371,6 +371,8 @@ std::unique_ptr<AsyncRequest> HTTPFileSource::request(const Resource& resource,
std::make_unique<Error>(Error::Reason::Other, std::string{ "HTTP status code " } +
std::to_string(responseCode));
}
+ } else if ([url isFileURL]) {
+ response.data = std::make_shared<std::string>((const char *)[data bytes], [data length]);
} else {
// This should never happen.
response.error = std::make_unique<Error>(Error::Reason::Other,