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/annotation/polyline.cpp | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'platform/android/src/annotation/polyline.cpp') diff --git a/platform/android/src/annotation/polyline.cpp b/platform/android/src/annotation/polyline.cpp index 3723dc1871..22d25a0f75 100644 --- a/platform/android/src/annotation/polyline.cpp +++ b/platform/android/src/annotation/polyline.cpp @@ -5,45 +5,44 @@ namespace mbgl { namespace android { -jni::Class Polyline::javaClass; - mbgl::LineAnnotation Polyline::toAnnotation(jni::JNIEnv& env, jni::Object polyline) { - auto points = Polyline::getPoints(env, polyline); + auto points = jni::SeizeLocal(env, Polyline::getPoints(env, polyline)); - mbgl::LineAnnotation annotation { MultiPoint::toGeometry>(env, points) }; + mbgl::LineAnnotation annotation { MultiPoint::toGeometry>(env, *points) }; annotation.opacity = { Polyline::getOpacity(env, polyline) }; annotation.color = { Polyline::getColor(env, polyline) }; annotation.width = { Polyline::getWidth(env, polyline) }; - jni::DeleteLocalRef(env, points); - return annotation; } jni::Object Polyline::getPoints(jni::JNIEnv& env, jni::Object polyline) { - static auto field = Polyline::javaClass.GetField>(env, "points"); + static auto javaClass = jni::Class::Singleton(env); + static auto field = javaClass.GetField>(env, "points"); return polyline.Get(env, field); } float Polyline::getOpacity(jni::JNIEnv& env, jni::Object polyline) { - static auto field = Polyline::javaClass.GetField(env, "alpha"); + static auto javaClass = jni::Class::Singleton(env); + static auto field = javaClass.GetField(env, "alpha"); return polyline.Get(env, field); } mbgl::Color Polyline::getColor(jni::JNIEnv& env, jni::Object polyline) { - static auto field = Polyline::javaClass.GetField(env, "color"); + static auto javaClass = jni::Class::Singleton(env); + static auto field = javaClass.GetField(env, "color"); return *conversion::convert(env, polyline.Get(env, field)); } float Polyline::getWidth(jni::JNIEnv& env, jni::Object polyline) { - static auto field = Polyline::javaClass.GetField(env, "width"); + static auto javaClass = jni::Class::Singleton(env); + static auto field = javaClass.GetField(env, "width"); return polyline.Get(env, field); } void Polyline::registerNative(jni::JNIEnv& env) { - Polyline::javaClass = *jni::Class::Find(env).NewGlobalRef(env).release(); + jni::Class::Singleton(env); } - } // namespace android } // namespace mbgl \ No newline at end of file -- cgit v1.2.1 From 5911e3b13f2f2b6741e26db3e41513ed21cc95b4 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 22 Aug 2018 11:44:07 -0700 Subject: [android] Simplify annotation conversion --- platform/android/src/annotation/polyline.cpp | 39 ++++++++-------------------- 1 file changed, 11 insertions(+), 28 deletions(-) (limited to 'platform/android/src/annotation/polyline.cpp') diff --git a/platform/android/src/annotation/polyline.cpp b/platform/android/src/annotation/polyline.cpp index 22d25a0f75..080efa1960 100644 --- a/platform/android/src/annotation/polyline.cpp +++ b/platform/android/src/annotation/polyline.cpp @@ -6,38 +6,21 @@ namespace mbgl { namespace android { mbgl::LineAnnotation Polyline::toAnnotation(jni::JNIEnv& env, jni::Object polyline) { - auto points = jni::SeizeLocal(env, Polyline::getPoints(env, polyline)); - - mbgl::LineAnnotation annotation { MultiPoint::toGeometry>(env, *points) }; - annotation.opacity = { Polyline::getOpacity(env, polyline) }; - annotation.color = { Polyline::getColor(env, polyline) }; - annotation.width = { Polyline::getWidth(env, polyline) }; - - return annotation; -} - -jni::Object Polyline::getPoints(jni::JNIEnv& env, jni::Object polyline) { static auto javaClass = jni::Class::Singleton(env); - static auto field = javaClass.GetField>(env, "points"); - return polyline.Get(env, field); -} + static auto points = javaClass.GetField>(env, "points"); + static auto alpha = javaClass.GetField(env, "alpha"); + static auto color = javaClass.GetField(env, "color"); + static auto width = javaClass.GetField(env, "width"); -float Polyline::getOpacity(jni::JNIEnv& env, jni::Object polyline) { - static auto javaClass = jni::Class::Singleton(env); - static auto field = javaClass.GetField(env, "alpha"); - return polyline.Get(env, field); -} + mbgl::LineAnnotation annotation { + MultiPoint::toGeometry>(env, *jni::SeizeLocal(env, polyline.Get(env, points))) + }; -mbgl::Color Polyline::getColor(jni::JNIEnv& env, jni::Object polyline) { - static auto javaClass = jni::Class::Singleton(env); - static auto field = javaClass.GetField(env, "color"); - return *conversion::convert(env, polyline.Get(env, field)); -} + annotation.opacity = polyline.Get(env, alpha); + annotation.color = *conversion::convert(env, polyline.Get(env, color)); + annotation.width = polyline.Get(env, width); -float Polyline::getWidth(jni::JNIEnv& env, jni::Object polyline) { - static auto javaClass = jni::Class::Singleton(env); - static auto field = javaClass.GetField(env, "width"); - return polyline.Get(env, field); + return annotation; } void Polyline::registerNative(jni::JNIEnv& env) { -- 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/annotation/polyline.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'platform/android/src/annotation/polyline.cpp') diff --git a/platform/android/src/annotation/polyline.cpp b/platform/android/src/annotation/polyline.cpp index 080efa1960..d6161e856e 100644 --- a/platform/android/src/annotation/polyline.cpp +++ b/platform/android/src/annotation/polyline.cpp @@ -5,15 +5,15 @@ namespace mbgl { namespace android { -mbgl::LineAnnotation Polyline::toAnnotation(jni::JNIEnv& env, jni::Object polyline) { - static auto javaClass = jni::Class::Singleton(env); +mbgl::LineAnnotation Polyline::toAnnotation(jni::JNIEnv& env, const jni::Object& polyline) { + static auto& javaClass = jni::Class::Singleton(env); static auto points = javaClass.GetField>(env, "points"); static auto alpha = javaClass.GetField(env, "alpha"); static auto color = javaClass.GetField(env, "color"); static auto width = javaClass.GetField(env, "width"); mbgl::LineAnnotation annotation { - MultiPoint::toGeometry>(env, *jni::SeizeLocal(env, polyline.Get(env, points))) + MultiPoint::toGeometry>(env, polyline.Get(env, points)) }; annotation.opacity = polyline.Get(env, alpha); -- cgit v1.2.1