1 files changed, 11 insertions, 12 deletions
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> Polyline::javaClass;
-
 mbgl::LineAnnotation Polyline::toAnnotation(jni::JNIEnv& env, jni::Object<Polyline> polyline) {
-    auto points = Polyline::getPoints(env, polyline);
+    auto points = jni::SeizeLocal(env, Polyline::getPoints(env, polyline));
 
-    mbgl::LineAnnotation annotation { MultiPoint::toGeometry<mbgl::LineString<double>>(env, points) };
+    mbgl::LineAnnotation annotation { MultiPoint::toGeometry<mbgl::LineString<double>>(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<java::util::List> Polyline::getPoints(jni::JNIEnv& env, jni::Object<Polyline> polyline) {
-    static auto field = Polyline::javaClass.GetField<jni::Object<java::util::List>>(env, "points");
+    static auto javaClass = jni::Class<Polyline>::Singleton(env);
+    static auto field = javaClass.GetField<jni::Object<java::util::List>>(env, "points");
     return polyline.Get(env, field);
 }
 
 float Polyline::getOpacity(jni::JNIEnv& env, jni::Object<Polyline> polyline) {
-    static auto field = Polyline::javaClass.GetField<float>(env, "alpha");
+    static auto javaClass = jni::Class<Polyline>::Singleton(env);
+    static auto field = javaClass.GetField<float>(env, "alpha");
     return polyline.Get(env, field);
 }
 
 mbgl::Color Polyline::getColor(jni::JNIEnv& env, jni::Object<Polyline> polyline) {
-    static auto field = Polyline::javaClass.GetField<int>(env, "color");
+    static auto javaClass = jni::Class<Polyline>::Singleton(env);
+    static auto field = javaClass.GetField<int>(env, "color");
     return *conversion::convert<mbgl::Color, int>(env, polyline.Get(env, field));
 }
 
 float Polyline::getWidth(jni::JNIEnv& env, jni::Object<Polyline> polyline) {
-    static auto field = Polyline::javaClass.GetField<float>(env, "width");
+    static auto javaClass = jni::Class<Polyline>::Singleton(env);
+    static auto field = javaClass.GetField<float>(env, "width");
     return polyline.Get(env, field);
 }
 
 void Polyline::registerNative(jni::JNIEnv& env) {
-    Polyline::javaClass = *jni::Class<Polyline>::Find(env).NewGlobalRef(env).release();
+    jni::Class<Polyline>::Singleton(env);
 }
 
-
 } // namespace android
 } // namespace mbgl
 \ No newline at end of file