tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] Check if Mapbox instance exists before creating default file source

Browse Source 
This check is needed for mbgl-benchmark target, as it does not require Mapbox
instance, nor Android asset manager.
This commit is contained in:
Alexander Shalamov
2019-10-04 11:56:26 +03:00
parent 946b9d2281
commit 198e345339
3 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platform/android/src/file_source.cpp
View File

@@ -17,9 +17,14 @@ namespace mbgl {
std::shared_ptr<FileSource> FileSource::createPlatformFileSource(const ResourceOptions& options) {
auto env{android::AttachEnv()};
auto assetManager = android::Mapbox::getAssetManager(*env);
auto fileSource = std::make_shared<DefaultFileSource>(options.cachePath(),
std::make_unique<AssetManagerFileSource>(*env, assetManager));
std::shared_ptr<DefaultFileSource> fileSource;
if (android::Mapbox::hasInstance(*env)) {
auto assetManager = android::Mapbox::getAssetManager(*env);
fileSource = std::make_shared<DefaultFileSource>(options.cachePath(),
std::make_unique<AssetManagerFileSource>(*env, assetManager));
} else {
fileSource = std::make_shared<DefaultFileSource>(options.cachePath(), options.assetPath());
}
fileSource->setAccessToken(options.accessToken());
return fileSource;
}

6
platform/android/src/mapbox.cpp
View File

@@ -9,6 +9,12 @@ jni::Local<jni::Object<AssetManager>> Mapbox::getAssetManager(jni::JNIEnv& env)
return javaClass.Call(env, method);
}
jboolean Mapbox::hasInstance(jni::JNIEnv& env) {
static auto& javaClass = jni::Class<Mapbox>::Singleton(env);
auto method = javaClass.GetStaticMethod<jboolean()>(env, "hasInstance");
return javaClass.Call(env, method);
}
void Mapbox::registerNative(jni::JNIEnv& env) {
jni::Class<Mapbox>::Singleton(env);
}

1
platform/android/src/mapbox.hpp
View File

@@ -10,6 +10,7 @@ namespace android {
class Mapbox {
public:
static constexpr auto Name() { return "com/mapbox/mapboxsdk/Mapbox"; };
static jboolean hasInstance(jni::JNIEnv&);
static jni::Local<jni::Object<AssetManager>> getAssetManager(jni::JNIEnv&);
static void registerNative(jni::JNIEnv&);
};