diff --git a/platform/android/src/file_source.cpp b/platform/android/src/file_source.cpp index 234d8d975..a002d6616 100644 --- a/platform/android/src/file_source.cpp +++ b/platform/android/src/file_source.cpp @@ -17,9 +17,14 @@ namespace mbgl { std::shared_ptr FileSource::createPlatformFileSource(const ResourceOptions& options) { auto env{android::AttachEnv()}; - auto assetManager = android::Mapbox::getAssetManager(*env); - auto fileSource = std::make_shared(options.cachePath(), - std::make_unique(*env, assetManager)); + std::shared_ptr fileSource; + if (android::Mapbox::hasInstance(*env)) { + auto assetManager = android::Mapbox::getAssetManager(*env); + fileSource = std::make_shared(options.cachePath(), + std::make_unique(*env, assetManager)); + } else { + fileSource = std::make_shared(options.cachePath(), options.assetPath()); + } fileSource->setAccessToken(options.accessToken()); return fileSource; } diff --git a/platform/android/src/mapbox.cpp b/platform/android/src/mapbox.cpp index c835518b4..5246739cf 100644 --- a/platform/android/src/mapbox.cpp +++ b/platform/android/src/mapbox.cpp @@ -9,6 +9,12 @@ jni::Local> Mapbox::getAssetManager(jni::JNIEnv& env) return javaClass.Call(env, method); } +jboolean Mapbox::hasInstance(jni::JNIEnv& env) { + static auto& javaClass = jni::Class::Singleton(env); + auto method = javaClass.GetStaticMethod(env, "hasInstance"); + return javaClass.Call(env, method); +} + void Mapbox::registerNative(jni::JNIEnv& env) { jni::Class::Singleton(env); } diff --git a/platform/android/src/mapbox.hpp b/platform/android/src/mapbox.hpp index 2d9a657fa..813f5bf17 100644 --- a/platform/android/src/mapbox.hpp +++ b/platform/android/src/mapbox.hpp @@ -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> getAssetManager(jni::JNIEnv&); static void registerNative(jni::JNIEnv&); };