diff options
Diffstat (limited to 'platform/android/src/annotation/marker.cpp')
-rw-r--r-- | platform/android/src/annotation/marker.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/platform/android/src/annotation/marker.cpp b/platform/android/src/annotation/marker.cpp index a1fe436dbd..b9a8c714a1 100644 --- a/platform/android/src/annotation/marker.cpp +++ b/platform/android/src/annotation/marker.cpp @@ -3,29 +3,21 @@ namespace mbgl { namespace android { -jni::Class<Marker> Marker::javaClass; - mbgl::Point<double> Marker::getPosition(jni::JNIEnv& env, jni::Object<Marker> marker) { - static auto positionField = Marker::javaClass.GetField<jni::Object<LatLng>>(env, "position"); - auto jPosition = marker.Get(env, positionField); - auto position = LatLng::getGeometry(env, jPosition); - jni::DeleteLocalRef(env, jPosition); - return position; + static auto javaClass = jni::Class<Marker>::Singleton(env); + static auto positionField = javaClass.GetField<jni::Object<LatLng>>(env, "position"); + return LatLng::getGeometry(env, *jni::SeizeLocal(env, marker.Get(env, positionField))); } std::string Marker::getIconId(jni::JNIEnv& env, jni::Object<Marker> marker) { - static auto iconIdField = Marker::javaClass.GetField<jni::String>(env, "iconId"); - auto jIconId = marker.Get(env, iconIdField); - auto iconId = jni::Make<std::string>(env, jIconId); - jni::DeleteLocalRef(env, jIconId); - return iconId; + static auto javaClass = jni::Class<Marker>::Singleton(env); + static auto iconIdField = javaClass.GetField<jni::String>(env, "iconId"); + return jni::Make<std::string>(env, *jni::SeizeLocal(env, marker.Get(env, iconIdField))); } void Marker::registerNative(jni::JNIEnv& env) { - // Lookup the class - Marker::javaClass = *jni::Class<Marker>::Find(env).NewGlobalRef(env).release(); + jni::Class<Marker>::Singleton(env); } - } // namespace android } // namespace mbgl
\ No newline at end of file |