summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortobrun <tobrun.van.nuland@gmail.com>2019-04-12 15:04:14 +0200
committerTobrun <tobrun.van.nuland@gmail.com>2019-04-12 19:46:31 +0200
commit19c6010ff29eba791be76e26dbbeb9c3c325827a (patch)
tree1d68965b821597791eef61bb816ad89c0e2936a1
parent714b2bcdc61fa7dc022ef1767a59da145e0f619d (diff)
downloadqtlocation-mapboxgl-19c6010ff29eba791be76e26dbbeb9c3c325827a.tar.gz
[android] - allow snapshot generation without overlain view content
-rwxr-xr-xplatform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java13
1 files changed, 9 insertions, 4 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 c2aed13ddd..f7086ac712 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
@@ -1047,10 +1047,15 @@ final class NativeMapView implements NativeMap {
if (checkState("OnSnapshotReady")) {
return;
}
-
- Bitmap viewContent = viewCallback.getViewContent();
- if (snapshotReadyCallback != null && mapContent != null && viewContent != null) {
- snapshotReadyCallback.onSnapshotReady(BitmapUtils.mergeBitmap(mapContent, viewContent));
+ 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));
+ }
+ }
}
}