1 files changed, 18 insertions, 21 deletions

diff --git a/platform/android/src/annotation/polygon.cpp b/platform/android/src/annotation/polygon.cpp
index fbd849432a..f049911be0 100644
--- a/platform/android/src/annotation/polygon.cpp
+++ b/platform/android/src/annotation/polygon.cpp
@@ -5,63 +5,60 @@
 namespace mbgl {
 namespace android {
 
-jni::Class<Polygon> Polygon::javaClass;
-
 mbgl::FillAnnotation Polygon::toAnnotation(jni::JNIEnv& env, jni::Object<Polygon> polygon) {
-    auto points = Polygon::getPoints(env, polygon);
-    auto holes = Polygon::getHoles(env, polygon);
+    auto points = jni::SeizeLocal(env, Polygon::getPoints(env, polygon));
+    auto holes = jni::SeizeLocal(env, Polygon::getHoles(env, polygon));
 
-    mbgl::Polygon<double> geometry { MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, points) };
+    mbgl::Polygon<double> geometry { MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, *points) };
 
-    auto jHoleListsArray = java::util::List::toArray<java::util::List>(env, holes);
-    std::size_t jHoleListsSize = jHoleListsArray.Length(env);
+    auto jHoleListsArray = jni::SeizeLocal(env, java::util::List::toArray<java::util::List>(env, *holes));
+    std::size_t jHoleListsSize = jHoleListsArray->Length(env);
     for (std::size_t i = 0; i < jHoleListsSize; i++) {
-        auto jHoleList = jHoleListsArray.Get(env, i);
-        geometry.push_back(MultiPoint::toGeometry<mbgl::LinearRing<double>>(env, jHoleList));
-        jni::DeleteLocalRef(env, jHoleList);
+        geometry.push_back(MultiPoint::toGeometry<mbgl::LinearRing<double>>(env,
+            *jni::SeizeLocal(env, jHoleListsArray->Get(env, i))));
     }
-    jni::DeleteLocalRef(env, jHoleListsArray);
 
     mbgl::FillAnnotation annotation { geometry };
     annotation.opacity = { Polygon::getOpacity(env, polygon) };
     annotation.color = { Polygon::getFillColor(env, polygon) };
     annotation.outlineColor = { Polygon::getOutlineColor(env, polygon) };
 
-    jni::DeleteLocalRef(env, points);
-    jni::DeleteLocalRef(env, holes);
-
     return annotation;
 }
 
 jni::Object<java::util::List> Polygon::getPoints(jni::JNIEnv& env, jni::Object<Polygon> polygon) {
-    static auto field = Polygon::javaClass.GetField<jni::Object<java::util::List>>(env, "points");
+    static auto javaClass = jni::Class<Polygon>::Singleton(env);
+    static auto field = javaClass.GetField<jni::Object<java::util::List>>(env, "points");
     return polygon.Get(env, field);
 }
 
 jni::Object<java::util::List> Polygon::getHoles(jni::JNIEnv& env, jni::Object<Polygon> polygon) {
-    static auto field = Polygon::javaClass.GetField<jni::Object<java::util::List>>(env, "holes");
+    static auto javaClass = jni::Class<Polygon>::Singleton(env);
+    static auto field = javaClass.GetField<jni::Object<java::util::List>>(env, "holes");
     return polygon.Get(env, field);
 }
 
 float Polygon::getOpacity(jni::JNIEnv& env, jni::Object<Polygon> polygon) {
-    static auto field = Polygon::javaClass.GetField<float>(env, "alpha");
+    static auto javaClass = jni::Class<Polygon>::Singleton(env);
+    static auto field = javaClass.GetField<float>(env, "alpha");
     return polygon.Get(env, field);
 }
 
 mbgl::Color Polygon::getFillColor(jni::JNIEnv& env, jni::Object<Polygon> polygon) {
-    static auto field = Polygon::javaClass.GetField<int>(env, "fillColor");
+    static auto javaClass = jni::Class<Polygon>::Singleton(env);
+    static auto field = javaClass.GetField<int>(env, "fillColor");
     return *conversion::convert<mbgl::Color, int>(env, polygon.Get(env, field));
 }
 
 mbgl::Color Polygon::getOutlineColor(jni::JNIEnv& env, jni::Object<Polygon> polygon) {
-    static auto field = Polygon::javaClass.GetField<int>(env, "strokeColor");
+    static auto javaClass = jni::Class<Polygon>::Singleton(env);
+    static auto field = javaClass.GetField<int>(env, "strokeColor");
     return *conversion::convert<mbgl::Color, int>(env, polygon.Get(env, field));
 }
 
 void Polygon::registerNative(jni::JNIEnv& env) {
-    Polygon::javaClass = *jni::Class<Polygon>::Find(env).NewGlobalRef(env).release();
+    jni::Class<Polygon>::Singleton(env);
 }
 
-
 } // namespace android
 } // namespace mbgl
\ No newline at end of file