1 files changed, 5 insertions, 8 deletions
diff --git a/platform/android/src/style/transition_options.cpp b/platform/android/src/style/transition_options.cpp
index c70aa5fe2e..b908c37089 100644
--- a/platform/android/src/style/transition_options.cpp
+++ b/platform/android/src/style/transition_options.cpp
@@ -3,18 +3,15 @@
 namespace mbgl {
 namespace android {
 
-jni::Object<TransitionOptions> TransitionOptions::fromTransitionOptions(jni::JNIEnv& env, jlong duration, jlong delay) {
-    static auto method = TransitionOptions::javaClass.GetStaticMethod<jni::Object<TransitionOptions> (jlong, jlong)>(env, "fromTransitionOptions");
-    return TransitionOptions::javaClass.Call(env, method, duration, delay);
+jni::Local<jni::Object<TransitionOptions>> TransitionOptions::fromTransitionOptions(jni::JNIEnv& env, jlong duration, jlong delay) {
+    static auto& javaClass = jni::Class<TransitionOptions>::Singleton(env);
+    static auto method = javaClass.GetStaticMethod<jni::Object<TransitionOptions> (jlong, jlong)>(env, "fromTransitionOptions");
+    return javaClass.Call(env, method, duration, delay);
 }
 
 void TransitionOptions::registerNative(jni::JNIEnv& env) {
-    // Lookup the class
-    TransitionOptions::javaClass = *jni::Class<TransitionOptions>::Find(env).NewGlobalRef(env).release();
+    jni::Class<TransitionOptions>::Singleton(env);
 }
 
-jni::Class<TransitionOptions> TransitionOptions::javaClass;
-
-
 } // namespace android
 } // namespace mbgl
 \ No newline at end of file