diff options
author | tobrun <tobrun.van.nuland@gmail.com> | 2019-05-17 17:30:01 +0200 |
---|---|---|
committer | Tobrun <tobrun.van.nuland@gmail.com> | 2019-05-17 19:36:23 +0200 |
commit | 52a69044e8a5dfc1df518673e83909b184040615 (patch) | |
tree | 119a4e23c5366ce8309a7f4a23e0b7da434444c5 /platform | |
parent | 99f090b955e03ee2e477eeb84878ae9c225d30c3 (diff) | |
download | qtlocation-mapboxgl-52a69044e8a5dfc1df518673e83909b184040615.tar.gz |
[android] - wrap jni callback with try-catch
Diffstat (limited to 'platform')
-rwxr-xr-x | platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java index 328b5f6bcb..1236d932e5 100755 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java @@ -1055,15 +1055,21 @@ final class NativeMapView implements NativeMap { if (checkState("OnSnapshotReady")) { return; } - if (snapshotReadyCallback != null && mapContent != null) { - if (viewCallback == null) { - snapshotReadyCallback.onSnapshotReady(mapContent); - } else { - Bitmap viewContent = viewCallback.getViewContent(); - if (viewContent != null) { - snapshotReadyCallback.onSnapshotReady(BitmapUtils.mergeBitmap(mapContent, viewContent)); + + try { + if (snapshotReadyCallback != null && mapContent != null) { + if (viewCallback == null) { + snapshotReadyCallback.onSnapshotReady(mapContent); + } else { + Bitmap viewContent = viewCallback.getViewContent(); + if (viewContent != null) { + snapshotReadyCallback.onSnapshotReady(BitmapUtils.mergeBitmap(mapContent, viewContent)); + } } } + } catch (Throwable err) { + Logger.e(TAG, "Exception in onSnapshotReady", err); + throw err; } } |