1 files changed, 5 insertions, 8 deletions
diff --git a/platform/android/src/gson/json_array.hpp b/platform/android/src/gson/json_array.hpp
index c9ae98692f..24d5d3d291 100644
--- a/platform/android/src/gson/json_array.hpp
+++ b/platform/android/src/gson/json_array.hpp
@@ -1,7 +1,6 @@
 #pragma once
 
-#include <mapbox/geometry.hpp>
-#include <mbgl/util/noncopyable.hpp>
+#include "json_element.hpp"
 
 #include <jni/jni.hpp>
 
@@ -9,15 +8,13 @@ namespace mbgl {
 namespace android {
 namespace gson {
 
-class JsonArray : private mbgl::util::noncopyable {
+class JsonArray {
 public:
+    using SuperTag = JsonElement;
     static constexpr auto Name() { return "com/google/gson/JsonArray"; };
 
-    static jni::Object<JsonArray> New(jni::JNIEnv&, const std::vector<mapbox::geometry::value>&);
-
-    static std::vector<mapbox::geometry::value> convert(JNIEnv&, jni::Object<JsonArray>);
-
-    static jni::Class<JsonArray> javaClass;
+    static jni::Local<jni::Object<JsonArray>> New(jni::JNIEnv&, const std::vector<mbgl::Value>&);
+    static std::vector<mbgl::Value> convert(JNIEnv&, const jni::Object<JsonArray>&);
 
     static void registerNative(jni::JNIEnv&);
 };