summaryrefslogtreecommitdiff
path: root/platform/android/src/gson/json_element.hpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-08-22 11:28:07 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2018-09-07 09:44:12 -0700
commit6be8302296147515e0b0d7ed7cc46d195227118e (patch)
tree5c7e4c1407719058576b858230c77331fac3616d /platform/android/src/gson/json_element.hpp
parent3948bbd7775ea336e54fa6f152f05a139ee88750 (diff)
downloadqtlocation-mapboxgl-6be8302296147515e0b0d7ed7cc46d195227118e.tar.gz
[android] Simplify JSON conversion
Diffstat (limited to 'platform/android/src/gson/json_element.hpp')
-rw-r--r--platform/android/src/gson/json_element.hpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/platform/android/src/gson/json_element.hpp b/platform/android/src/gson/json_element.hpp
index 5c68934871..384459dc41 100644
--- a/platform/android/src/gson/json_element.hpp
+++ b/platform/android/src/gson/json_element.hpp
@@ -1,6 +1,6 @@
#pragma once
-#include <mapbox/geometry.hpp>
+#include <mbgl/util/feature.hpp>
#include <jni/jni.hpp>
@@ -12,13 +12,8 @@ class JsonElement : public jni::ObjectTag {
public:
static constexpr auto Name() { return "com/google/gson/JsonElement"; };
- static jni::Object<JsonElement> New(jni::JNIEnv&, const mapbox::geometry::value&);
- static mapbox::geometry::value convert(JNIEnv&, jni::Object<JsonElement>);
-
- static bool isJsonObject(JNIEnv&, jni::Object<JsonElement>);
- static bool isJsonArray(JNIEnv&, jni::Object<JsonElement>);
- static bool isJsonPrimitive(JNIEnv&, jni::Object<JsonElement>);
- static bool isJsonNull(JNIEnv&, jni::Object<JsonElement>);
+ static jni::Object<JsonElement> New(jni::JNIEnv&, const mbgl::Value&);
+ static mbgl::Value convert(JNIEnv&, jni::Object<JsonElement>);
static void registerNative(jni::JNIEnv&);
};