summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobrun Van Nuland <tobrun.van.nuland@gmail.com>2017-10-18 15:23:19 +0200
committerTobrun Van Nuland <tobrun.van.nuland@gmail.com>2017-10-18 15:23:19 +0200
commitfa63c0cda45c0f8ed605eac027109d23bce0a56f (patch)
tree6817b6a6385bc657e075afa735e6e9e621058f0d
parentfe6e0c360e9d2bcab975f7f469a5ad5537cf6a9c (diff)
downloadqtlocation-mapboxgl-upstream/10188-exception-handler.tar.gz
[android] - inform user about java excpetion as part of OnMapChange callbackupstream/10188-exception-handler
-rwxr-xr-xplatform/android/src/native_map_view.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/platform/android/src/native_map_view.cpp b/platform/android/src/native_map_view.cpp
index 24a35a7068..f4e11ffe51 100755
--- a/platform/android/src/native_map_view.cpp
+++ b/platform/android/src/native_map_view.cpp
@@ -103,7 +103,11 @@ void NativeMapView::notifyMapChange(mbgl::MapChange change) {
android::UniqueEnv _env = android::AttachEnv();
static auto onMapChanged = javaClass.GetMethod<void (int)>(*_env, "onMapChanged");
- javaPeer->Call(*_env, onMapChanged, (int) change);
+ try {
+ javaPeer->Call(*_env, onMapChanged, (int) change);
+ } catch (jni::PendingJavaException& exception) {
+ jni::ThrowJavaError(*_env, std::current_exception());
+ }
}
void NativeMapView::onCameraWillChange(MapObserver::CameraChangeMode mode) {