diff options
author | Ivo van Dongen <info@ivovandongen.nl> | 2016-11-10 12:07:25 +0100 |
---|---|---|
committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2016-11-11 13:46:10 +0100 |
commit | 3a4a27c95f1c10c480532c46c4edb7b3120b7a2b (patch) | |
tree | d016d69968893b4e55af67cbefeb8087536f1f9e /platform/android/src/jni.cpp | |
parent | 7d2f18b5ed94a857111d2863b1e1e4d1da232763 (diff) | |
download | qtlocation-mapboxgl-3a4a27c95f1c10c480532c46c4edb7b3120b7a2b.tar.gz |
[android] fix layer ownership
Diffstat (limited to 'platform/android/src/jni.cpp')
-rwxr-xr-x | platform/android/src/jni.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/platform/android/src/jni.cpp b/platform/android/src/jni.cpp index 1168fb9b89..832fa436c7 100755 --- a/platform/android/src/jni.cpp +++ b/platform/android/src/jni.cpp @@ -1100,12 +1100,13 @@ void nativeAddLayer(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, jlon assert(nativeLayerPtr != 0); NativeMapView *nativeMapView = reinterpret_cast<NativeMapView *>(nativeMapViewPtr); - Layer *layer = reinterpret_cast<Layer *>(nativeLayerPtr); - nativeMapView->getMap().addLayer( - layer->releaseCoreLayer(), - before ? mbgl::optional<std::string>(std_string_from_jstring(env, before)) : mbgl::optional<std::string>() - ); + Layer *layer = reinterpret_cast<Layer *>(nativeLayerPtr); + try { + layer->addToMap(nativeMapView->getMap(), before ? mbgl::optional<std::string>(std_string_from_jstring(env, before)) : mbgl::optional<std::string>()); + } catch (const std::runtime_error& error) { + jni::ThrowNew(*env, jni::FindClass(*env, "com/mapbox/mapboxsdk/style/layers/CannotAddLayerException"), error.what()); + } } void nativeRemoveLayer(JNIEnv *env, jni::jobject* obj, jlong nativeMapViewPtr, jni::jstring* id) { |