From 53c3c327f0ebea276d977f58a59cdb9449165518 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Fri, 17 Aug 2018 13:43:07 -0700 Subject: [android] Upgrade to latest jni.hpp --- platform/android/src/file_source.cpp | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'platform/android/src/file_source.cpp') diff --git a/platform/android/src/file_source.cpp b/platform/android/src/file_source.cpp index 2a6cac3b02..32c304b909 100644 --- a/platform/android/src/file_source.cpp +++ b/platform/android/src/file_source.cpp @@ -51,7 +51,7 @@ void FileSource::setResourceTransform(jni::JNIEnv& env, jni::Object(transformCallback.NewGlobalRef(env).release()->Get(), GenericGlobalRefDeleter())] + [callback = std::shared_ptr(transformCallback.NewGlobalRef(env).release().Get(), GenericGlobalRefDeleter())] (mbgl::Resource::Kind kind, const std::string&& url_) { android::UniqueEnv _env = android::AttachEnv(); return FileSource::ResourceTransformCallback::onURL(*_env, jni::Object(*callback), int(kind), url_); @@ -92,10 +92,9 @@ jni::jboolean FileSource::isResumed(jni::JNIEnv&) { return (jboolean) false; } -jni::Class FileSource::javaClass; - FileSource* FileSource::getNativePeer(jni::JNIEnv& env, jni::Object jFileSource) { - static auto field = FileSource::javaClass.GetField(env, "nativePtr"); + static auto javaClass = jni::Class::Singleton(env); + static auto field = javaClass.GetField(env, "nativePtr"); return reinterpret_cast(jFileSource.Get(env, field)); } @@ -106,15 +105,18 @@ mbgl::DefaultFileSource& FileSource::getDefaultFileSource(jni::JNIEnv& env, jni: } void FileSource::registerNative(jni::JNIEnv& env) { - //Register classes - FileSource::javaClass = *jni::Class::Find(env).NewGlobalRef(env).release(); - FileSource::ResourceTransformCallback::javaClass = *jni::Class::Find(env).NewGlobalRef(env).release(); + // Ensure the class for ResourceTransformCallback is cached. If it's requested for the + // first time on a background thread, Android's class loader heuristics will fail. + // https://developer.android.com/training/articles/perf-jni#faq_FindClass + jni::Class::Singleton(env); + + static auto javaClass = jni::Class::Singleton(env); #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod(name) // Register the peer jni::RegisterNativePeer( - env, FileSource::javaClass, "nativePtr", + env, javaClass, "nativePtr", std::make_unique>, "initialize", "finalize", @@ -131,16 +133,13 @@ void FileSource::registerNative(jni::JNIEnv& env) { // FileSource::ResourceTransformCallback // -jni::Class FileSource::ResourceTransformCallback::javaClass; - std::string FileSource::ResourceTransformCallback::onURL(jni::JNIEnv& env, jni::Object callback, int kind, std::string url_) { - static auto method = FileSource::ResourceTransformCallback::javaClass.GetMethod(env, "onURL"); - auto url = jni::Make(env, url_); + static auto javaClass = jni::Class::Singleton(env); + static auto method = javaClass.GetMethod(env, "onURL"); - url = callback.Call(env, method, kind, url); - auto urlStr = jni::Make(env, url); - jni::DeleteLocalRef(env, url); - return urlStr; + return jni::Make(env, + *jni::SeizeLocal(env, callback.Call(env, method, kind, + *jni::SeizeLocal(env, jni::Make(env, url_))))); } } // namespace android -- cgit v1.2.1 From 79bf0e8af6bf9ec829a352d56b8e70ccc8f4fa41 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 22 Aug 2018 12:27:43 -0700 Subject: [android] jni.hpp 4.0.0 --- platform/android/src/file_source.cpp | 39 ++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'platform/android/src/file_source.cpp') diff --git a/platform/android/src/file_source.cpp b/platform/android/src/file_source.cpp index 32c304b909..d9b8e12dc4 100644 --- a/platform/android/src/file_source.cpp +++ b/platform/android/src/file_source.cpp @@ -1,4 +1,5 @@ #include "file_source.hpp" +#include "attach_env.hpp" #include #include @@ -6,7 +7,6 @@ #include #include "asset_manager_file_source.hpp" -#include "jni/generic_global_ref_deleter.hpp" namespace mbgl { namespace android { @@ -14,9 +14,9 @@ namespace android { // FileSource // FileSource::FileSource(jni::JNIEnv& _env, - jni::String accessToken, - jni::String _cachePath, - jni::Object assetManager) { + const jni::String& accessToken, + const jni::String& _cachePath, + const jni::Object& assetManager) { // Create a core default file source fileSource = std::make_unique( jni::Make(_env, _cachePath) + "/mbgl-offline.db", @@ -31,30 +31,31 @@ FileSource::FileSource(jni::JNIEnv& _env, FileSource::~FileSource() { } -jni::String FileSource::getAccessToken(jni::JNIEnv& env) { +jni::Local FileSource::getAccessToken(jni::JNIEnv& env) { return jni::Make(env, fileSource->getAccessToken()); } -void FileSource::setAccessToken(jni::JNIEnv& env, jni::String token) { +void FileSource::setAccessToken(jni::JNIEnv& env, const jni::String& token) { fileSource->setAccessToken(jni::Make(env, token)); } -void FileSource::setAPIBaseUrl(jni::JNIEnv& env, jni::String url) { +void FileSource::setAPIBaseUrl(jni::JNIEnv& env, const jni::String& url) { fileSource->setAPIBaseURL(jni::Make(env, url)); } -void FileSource::setResourceTransform(jni::JNIEnv& env, jni::Object transformCallback) { +void FileSource::setResourceTransform(jni::JNIEnv& env, const jni::Object& transformCallback) { if (transformCallback) { + auto global = jni::NewGlobal(env, transformCallback); resourceTransform = std::make_unique>(*Scheduler::GetCurrent(), // Capture the ResourceTransformCallback object as a managed global into // the lambda. It is released automatically when we're setting a new ResourceTransform in // a subsequent call. // Note: we're converting it to shared_ptr because this lambda is converted to a std::function, // which requires copyability of its captured variables. - [callback = std::shared_ptr(transformCallback.NewGlobalRef(env).release().Get(), GenericGlobalRefDeleter())] + [callback = std::make_shared(std::move(global))] (mbgl::Resource::Kind kind, const std::string&& url_) { android::UniqueEnv _env = android::AttachEnv(); - return FileSource::ResourceTransformCallback::onURL(*_env, jni::Object(*callback), int(kind), url_); + return FileSource::ResourceTransformCallback::onURL(*_env, *callback, int(kind), url_); }); fileSource->setResourceTransform(resourceTransform->self()); } else { @@ -92,13 +93,13 @@ jni::jboolean FileSource::isResumed(jni::JNIEnv&) { return (jboolean) false; } -FileSource* FileSource::getNativePeer(jni::JNIEnv& env, jni::Object jFileSource) { - static auto javaClass = jni::Class::Singleton(env); +FileSource* FileSource::getNativePeer(jni::JNIEnv& env, const jni::Object& jFileSource) { + static auto& javaClass = jni::Class::Singleton(env); static auto field = javaClass.GetField(env, "nativePtr"); return reinterpret_cast(jFileSource.Get(env, field)); } -mbgl::DefaultFileSource& FileSource::getDefaultFileSource(jni::JNIEnv& env, jni::Object jFileSource) { +mbgl::DefaultFileSource& FileSource::getDefaultFileSource(jni::JNIEnv& env, const jni::Object& jFileSource) { FileSource* fileSource = FileSource::getNativePeer(env, jFileSource); assert(fileSource != nullptr); return *fileSource->fileSource; @@ -110,14 +111,14 @@ void FileSource::registerNative(jni::JNIEnv& env) { // https://developer.android.com/training/articles/perf-jni#faq_FindClass jni::Class::Singleton(env); - static auto javaClass = jni::Class::Singleton(env); + static auto& javaClass = jni::Class::Singleton(env); #define METHOD(MethodPtr, name) jni::MakeNativePeerMethod(name) // Register the peer jni::RegisterNativePeer( env, javaClass, "nativePtr", - std::make_unique>, + jni::MakePeer&>, "initialize", "finalize", METHOD(&FileSource::getAccessToken, "getAccessToken"), @@ -133,13 +134,13 @@ void FileSource::registerNative(jni::JNIEnv& env) { // FileSource::ResourceTransformCallback // -std::string FileSource::ResourceTransformCallback::onURL(jni::JNIEnv& env, jni::Object callback, int kind, std::string url_) { - static auto javaClass = jni::Class::Singleton(env); +std::string FileSource::ResourceTransformCallback::onURL(jni::JNIEnv& env, const jni::Object& callback, int kind, std::string url_) { + static auto& javaClass = jni::Class::Singleton(env); static auto method = javaClass.GetMethod(env, "onURL"); return jni::Make(env, - *jni::SeizeLocal(env, callback.Call(env, method, kind, - *jni::SeizeLocal(env, jni::Make(env, url_))))); + callback.Call(env, method, kind, + jni::Make(env, url_))); } } // namespace android -- cgit v1.2.1