diff options
author | Leith Bade <leith@mapbox.com> | 2014-11-18 00:33:59 +1100 |
---|---|---|
committer | Leith Bade <leith@mapbox.com> | 2014-11-18 00:33:59 +1100 |
commit | 80be6c4eb01a23fb0e943e1b4f00f48cc51256a2 (patch) | |
tree | 6c8431b0faf523158f2ca865a8aeefcf1290bdb7 /platform/android | |
parent | f0e4e27cd383f9c8b674cbfebb7a15ba8f8b6c0b (diff) | |
download | qtlocation-mapboxgl-80be6c4eb01a23fb0e943e1b4f00f48cc51256a2.tar.gz |
Load CA bundle from APK
Remove Assetbridge
Diffstat (limited to 'platform/android')
-rw-r--r-- | platform/android/asset_request_baton.cpp | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/platform/android/asset_request_baton.cpp b/platform/android/asset_request_baton.cpp index c4e0a1799e..30819e506c 100644 --- a/platform/android/asset_request_baton.cpp +++ b/platform/android/asset_request_baton.cpp @@ -89,25 +89,7 @@ void AssetRequestBaton::run(uv_async_t *async) { cleanup(async); return; } -/* - if (stat.size > std::numeric_limits<int>::max()) { - // File is too large for us to open this way because uv_buf's only support unsigned - // ints as maximum size. - if (ptr->request) { - ptr->request->response = std::unique_ptr<Response>(new Response); - ptr->request->response->code = UV_EFBIG; - ptr->request->response->message = uv_strerror(UV_EFBIG); - ptr->request->notify(); - } - zip_fclose(ptr->apk_file); - ptr->apk_file = nullptr; - zip_close(ptr->apk); - ptr->apk = nullptr; - cleanup(async); - return; - } -*/ - //const unsigned int size = static_cast<unsigned int>(stat.size); + const std::unique_ptr<char[]> body = boost::make_unique<char[]>(stat.size); if (zip_fread(ptr->apk_file, reinterpret_cast<void *>(body.get()), stat.size) == -1 || |