This repository was archived by the owner on Aug 8, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
Use AAssetManager instead of bundling libzip #8712
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| #pragma once | ||
|
|
||
| namespace mbgl { | ||
| namespace android { | ||
|
|
||
| class AssetManager { | ||
| public: | ||
| static constexpr auto Name() { | ||
| return "android/content/res/AssetManager"; | ||
| }; | ||
| }; | ||
|
|
||
| } // namespace android | ||
| } // namespace mbgl |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| #include "asset_manager_file_source.hpp" | ||
|
|
||
| #include <mbgl/storage/response.hpp> | ||
| #include <mbgl/util/util.hpp> | ||
| #include <mbgl/util/thread.hpp> | ||
| #include <mbgl/util/url.hpp> | ||
|
|
||
| #include <android/asset_manager.h> | ||
| #include <android/asset_manager_jni.h> | ||
|
|
||
| namespace mbgl { | ||
|
|
||
| class AssetManagerFileSource::Impl { | ||
| public: | ||
| Impl(AAssetManager* assetManager_) : assetManager(assetManager_) { | ||
| } | ||
|
|
||
| void request(const std::string& url, FileSource::Callback callback) { | ||
| // Note: AssetManager already prepends "assets" to the filename. | ||
| const std::string path = mbgl::util::percentDecode(url.substr(8)); | ||
|
|
||
| Response response; | ||
|
|
||
| if (AAsset* asset = AAssetManager_open(assetManager, path.c_str(), AASSET_MODE_BUFFER)) { | ||
| response.data = std::make_shared<std::string>( | ||
| reinterpret_cast<const char*>(AAsset_getBuffer(asset)), AAsset_getLength64(asset)); | ||
| AAsset_close(asset); | ||
| } else { | ||
| response.error = std::make_unique<Response::Error>(Response::Error::Reason::NotFound, | ||
| "Could not read asset"); | ||
| } | ||
|
|
||
| callback(response); | ||
| } | ||
|
|
||
| private: | ||
| AAssetManager* assetManager; | ||
| }; | ||
|
|
||
| AssetManagerFileSource::AssetManagerFileSource(jni::JNIEnv& env, jni::Object<android::AssetManager> assetManager_) | ||
| : assetManager(assetManager_.NewGlobalRef(env)), | ||
| thread(std::make_unique<util::Thread<Impl>>( | ||
| util::ThreadContext{"AssetManagerFileSource", util::ThreadPriority::Low}, | ||
| AAssetManager_fromJava(&env, jni::Unwrap(**assetManager)))) { | ||
| } | ||
|
|
||
| AssetManagerFileSource::~AssetManagerFileSource() = default; | ||
|
|
||
| std::unique_ptr<AsyncRequest> AssetManagerFileSource::request(const Resource& resource, Callback callback) { | ||
| return thread->invokeWithCallback(&Impl::request, resource.url, callback); | ||
| } | ||
|
|
||
| } // namespace mbgl |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| #pragma once | ||
|
|
||
| #include <mbgl/storage/file_source.hpp> | ||
|
|
||
| #include "asset_manager.hpp" | ||
|
|
||
| #include <jni/jni.hpp> | ||
|
|
||
| namespace mbgl { | ||
|
|
||
| namespace util { | ||
| template <typename T> class Thread; | ||
| } // namespace util | ||
|
|
||
| class AssetManagerFileSource : public FileSource { | ||
| public: | ||
| AssetManagerFileSource(jni::JNIEnv&, jni::Object<android::AssetManager>); | ||
| ~AssetManagerFileSource() override; | ||
|
|
||
| std::unique_ptr<AsyncRequest> request(const Resource&, Callback) override; | ||
|
|
||
| private: | ||
| jni::UniqueObject<android::AssetManager> assetManager; | ||
| class Impl; | ||
| std::unique_ptr<util::Thread<Impl>> thread; | ||
| }; | ||
|
|
||
| } // namespace mbgl | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't want to use the thread pool?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We do, but I've modeled this FileSource after all the other FileSources, and they are still using
util::Thread. I attempted to port them to the actor system in #7678