summaryrefslogtreecommitdiff
path: root/platform/android/src/gson/json_array.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'platform/android/src/gson/json_array.cpp')
-rw-r--r--platform/android/src/gson/json_array.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/platform/android/src/gson/json_array.cpp b/platform/android/src/gson/json_array.cpp
index b5fb85e5d9..8ffa658b76 100644
--- a/platform/android/src/gson/json_array.cpp
+++ b/platform/android/src/gson/json_array.cpp
@@ -5,25 +5,25 @@ namespace mbgl {
namespace android {
namespace gson {
-jni::Object<JsonArray> JsonArray::New(jni::JNIEnv& env, const std::vector<mbgl::Value>& values){
- static auto javaClass = jni::Class<JsonArray>::Singleton(env);
+jni::Local<jni::Object<JsonArray>> JsonArray::New(jni::JNIEnv& env, const std::vector<mbgl::Value>& values){
+ static auto& javaClass = jni::Class<JsonArray>::Singleton(env);
static auto constructor = javaClass.GetConstructor(env);
static auto addMethod = javaClass.GetMethod<void (jni::Object<JsonElement>)>(env, "add");
auto jsonArray = javaClass.New(env, constructor);
for (const auto &v : values) {
- jsonArray.Call(env, addMethod, *jni::SeizeLocal(env, JsonElement::New(env, v)));
+ jsonArray.Call(env, addMethod, JsonElement::New(env, v));
}
return jsonArray;
}
-std::vector<mbgl::Value> JsonArray::convert(jni::JNIEnv& env, const jni::Object<JsonArray> jsonArray) {
+std::vector<mbgl::Value> JsonArray::convert(jni::JNIEnv& env, const jni::Object<JsonArray>& jsonArray) {
std::vector<mbgl::Value> values;
if (jsonArray) {
- static auto javaClass = jni::Class<JsonArray>::Singleton(env);
+ static auto& javaClass = jni::Class<JsonArray>::Singleton(env);
static auto getMethod = javaClass.GetMethod<jni::Object<JsonElement> (jni::jint)>(env, "get");
static auto sizeMethod = javaClass.GetMethod<jni::jint ()>(env, "size");
@@ -31,9 +31,9 @@ std::vector<mbgl::Value> JsonArray::convert(jni::JNIEnv& env, const jni::Object<
values.reserve(uint(size));
for (int i = 0; i < size; i++) {
- auto entry = jni::SeizeLocal(env, jsonArray.Call(env, getMethod, i));
- if (*entry) {
- values.push_back(JsonElement::convert(env, *entry));
+ auto entry = jsonArray.Call(env, getMethod, i);
+ if (entry) {
+ values.push_back(JsonElement::convert(env, entry));
}
}
}