[android] [WIP] Create snapshot wrapper

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java

@@ -38,6 +38,7 @@
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.widgets.MyLocationViewSettings;
+import com.mapbox.mapboxsdk.snapshotter.Snapshot;
 import com.mapbox.mapboxsdk.style.layers.Filter;
 import com.mapbox.mapboxsdk.style.layers.Layer;
 import com.mapbox.mapboxsdk.style.light.Light;
@@ -2461,7 +2462,7 @@ public interface SnapshotReadyCallback {
      *
      * @param snapshot the snapshot bitmap
      */
-    void onSnapshotReady(Bitmap snapshot);
+    void onSnapshotReady(Snapshot snapshot);
   }
 
   /**

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/NativeMapView.java

@@ -20,6 +20,7 @@
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.geometry.ProjectedMeters;
 import com.mapbox.mapboxsdk.maps.renderer.MapRenderer;
+import com.mapbox.mapboxsdk.snapshotter.Snapshot;
 import com.mapbox.mapboxsdk.storage.FileSource;
 import com.mapbox.mapboxsdk.style.layers.CannotAddLayerException;
 import com.mapbox.mapboxsdk.style.layers.Filter;
@@ -827,14 +828,18 @@ protected void onMapChanged(int rawChange) {
     }
   }
 
-  protected void onSnapshotReady(Bitmap mapContent) {
+  protected void onSnapshotReady(Snapshot mapContent) {
     if (isDestroyedOn("OnSnapshotReady")) {
       return;
     }
 
-    Bitmap viewContent = BitmapUtils.createBitmapFromView(mapView);
-    if (snapshotReadyCallback != null && mapContent != null && viewContent != null) {
-      snapshotReadyCallback.onSnapshotReady(BitmapUtils.mergeBitmap(mapContent, viewContent));
+    Bitmap viewContentBitmap = BitmapUtils.createBitmapFromView(mapView);
+    if (snapshotReadyCallback != null && mapContent != null && mapContent.getBitmap() != null
+      && viewContentBitmap != null) {
+      Bitmap mapContentBitmap = mapContent.getBitmap();
+      Bitmap mergedBitmap = BitmapUtils.mergeBitmap(mapContentBitmap, viewContentBitmap);
+      Snapshot mergedSnapshot = new Snapshot(mergedBitmap);
+      snapshotReadyCallback.onSnapshotReady(mergedSnapshot);
     }
   }
 

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java

@@ -184,7 +184,7 @@ public void start(@NonNull MapboxMap.SnapshotReadyCallback callback) {
    * Starts loading and rendering the snapshot. The callbacks will be fired
    * on the calling thread.
    *
-   * @param callback the callback to use when the snapshot is ready
+   * @param callback     the callback to use when the snapshot is ready
    * @param errorHandler the error handler to use on snapshot errors
    */
   public void start(@NonNull MapboxMap.SnapshotReadyCallback callback, ErrorHandler errorHandler) {
@@ -217,12 +217,14 @@ protected void addOverlay(Bitmap original) {
    * Called by JNI peer when snapshot is ready.
    * Always called on the origin (main) thread.
    *
-   * @param bitmap the generated snapshot
+   * @param snapshot the generated snapshot
    */
-  protected void onSnapshotReady(Bitmap bitmap) {
+  protected void onSnapshotReady(Snapshot snapshot) {
     if (callback != null) {
+      Bitmap bitmap = snapshot.getBitmap();
       addOverlay(bitmap);
-      callback.onSnapshotReady(bitmap);
+      Snapshot overlaidSnapshot = new Snapshot(bitmap);
+      callback.onSnapshotReady(overlaidSnapshot);
       reset();
     }
   }

platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/Snapshot.java

@@ -0,0 +1,16 @@
+package com.mapbox.mapboxsdk.snapshotter;
+
+import android.graphics.Bitmap;
+
+
+public class Snapshot {
+  private final Bitmap bitmap;
+
+  public Snapshot(Bitmap bitmap) {
+    this.bitmap = bitmap;
+  }
+
+  public Bitmap getBitmap() {
+    return bitmap;
+  }
+}

platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/PrintActivity.java

@@ -10,6 +10,7 @@
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
+import com.mapbox.mapboxsdk.snapshotter.Snapshot;
 import com.mapbox.mapboxsdk.testapp.R;
 
 /**
@@ -48,10 +49,11 @@ public void onClick(View view) {
   }
 
   @Override
-  public void onSnapshotReady(Bitmap snapshot) {
+  public void onSnapshotReady(Snapshot snapshot) {
     PrintHelper photoPrinter = new PrintHelper(this);
     photoPrinter.setScaleMode(PrintHelper.SCALE_MODE_FIT);
-    photoPrinter.printBitmap("map.jpg - mapbox print job", snapshot);
+    Bitmap bitmap = snapshot.getBitmap();
+    photoPrinter.printBitmap("map.jpg - mapbox print job", bitmap);
   }
 
   @Override

platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.java

@@ -13,6 +13,7 @@
 import com.mapbox.mapboxsdk.maps.MapView;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
+import com.mapbox.mapboxsdk.snapshotter.Snapshot;
 import com.mapbox.mapboxsdk.testapp.R;
 
 import java.util.Locale;
@@ -51,11 +52,12 @@ public void onClick(View view) {
     final long startTime = System.nanoTime();
     mapboxMap.snapshot(new MapboxMap.SnapshotReadyCallback() {
       @Override
-      public void onSnapshotReady(Bitmap snapshot) {
+      public void onSnapshotReady(Snapshot snapshot) {
         long endTime = System.nanoTime();
         long duration = (long) ((endTime - startTime) / 1e6);
         ImageView snapshotView = (ImageView) findViewById(R.id.imageView);
-        snapshotView.setImageBitmap(snapshot);
+        Bitmap bitmap = snapshot.getBitmap();
+        snapshotView.setImageBitmap(bitmap);
         Toast.makeText(
           SnapshotActivity.this,
           String.format(Locale.getDefault(), "Snapshot taken in %d ms", duration),

platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java

@@ -13,6 +13,7 @@
 import com.mapbox.mapboxsdk.geometry.LatLngBounds;
 import com.mapbox.mapboxsdk.maps.MapboxMap;
 import com.mapbox.mapboxsdk.snapshotter.MapSnapshotter;
+import com.mapbox.mapboxsdk.snapshotter.Snapshot;
 import com.mapbox.mapboxsdk.testapp.R;
 
 import java.util.ArrayList;
@@ -98,10 +99,11 @@ private void startSnapShot(final int row, final int column) {
 
     snapshotter.start(new MapboxMap.SnapshotReadyCallback() {
       @Override
-      public void onSnapshotReady(Bitmap snapshot) {
+      public void onSnapshotReady(Snapshot snapshot) {
         Timber.i("Got the snapshot");
         ImageView imageView = new ImageView(MapSnapshotterActivity.this);
-        imageView.setImageBitmap(snapshot);
+        Bitmap bitmap = snapshot.getBitmap();
+        imageView.setImageBitmap(bitmap);
         grid.addView(
           imageView,
           new GridLayout.LayoutParams(GridLayout.spec(row), GridLayout.spec(column))

platform/android/config.cmake

@@ -89,6 +89,8 @@ macro(mbgl_platform_core)
         PRIVATE platform/linux/src/headless_display_egl.cpp
         PRIVATE platform/android/src/snapshotter/map_snapshotter.cpp
         PRIVATE platform/android/src/snapshotter/map_snapshotter.hpp
+        PRIVATE platform/android/src/snapshotter/snapshot.cpp
+        PRIVATE platform/android/src/snapshotter/snapshot.hpp
     )
 
     target_include_directories(mbgl-core

platform/android/src/jni.cpp

@@ -50,6 +50,7 @@
 #include "style/sources/sources.hpp"
 #include "style/light.hpp"
 #include "snapshotter/map_snapshotter.hpp"
+#include "snapshotter/snapshot.hpp"
 
 namespace mbgl {
 namespace android {
@@ -185,6 +186,7 @@ void registerNatives(JavaVM *vm) {
 
     // Snapshotter
     MapSnapshotter::registerNative(env);
+    Snapshot::registerNative(env);
 }
 
 } // namespace android

platform/android/src/native_map_view.cpp

@@ -38,6 +38,7 @@
 #include "conversion/collection.hpp"
 #include "style/conversion/filter.hpp"
 #include "geojson/conversion/feature.hpp"
+#include "snapshotter/snapshot.hpp"
 
 #include "jni.hpp"
 #include "attach_env.hpp"
@@ -399,10 +400,11 @@ void NativeMapView::scheduleSnapshot(jni::JNIEnv&) {
         auto _env = android::AttachEnv();
         // Convert image to bitmap
         auto bitmap = Bitmap::CreateBitmap(*_env, std::move(image));
+        auto snapshot = Snapshot::New(*_env, bitmap);
 
         // invoke Mapview#OnSnapshotReady
-        static auto onSnapshotReady = javaClass.GetMethod<void (jni::Object<Bitmap>)>(*_env, "onSnapshotReady");
-        javaPeer->Call(*_env, onSnapshotReady, bitmap);
+        static auto onSnapshotReady = javaClass.GetMethod<void (jni::Object<Snapshot>)>(*_env, "onSnapshotReady");
+        javaPeer->Call(*_env, onSnapshotReady, snapshot);
     });
 }
 

platform/android/src/snapshotter/map_snapshotter.cpp

@@ -1,4 +1,5 @@
 #include "map_snapshotter.hpp"
+#include "snapshot.hpp"
 
 #include <mbgl/renderer/renderer.hpp>
 #include <mbgl/style/style.hpp>
@@ -69,10 +70,11 @@ void MapSnapshotter::start(JNIEnv&) {
         } else {
             // Create the bitmap
             auto bitmap = Bitmap::CreateBitmap(*_env, std::move(image));
+            auto snapshot = Snapshot::New(*_env, bitmap);
 
             // invoke callback
-            static auto onSnapshotReady = javaClass.GetMethod<void (jni::Object<Bitmap>)>(*_env, "onSnapshotReady");
-            javaPeer->Call(*_env, onSnapshotReady, bitmap);
+            static auto onSnapshotReady = javaClass.GetMethod<void (jni::Object<Snapshot>)>(*_env, "onSnapshotReady");
+            javaPeer->Call(*_env, onSnapshotReady, snapshot);
         }
     });
 

platform/android/src/snapshotter/snapshot.cpp

@@ -0,0 +1,22 @@
+#include "snapshot.hpp"
+
+#include "../bitmap.hpp"
+
+namespace mbgl {
+namespace android {
+
+jni::Object<Snapshot> Snapshot::New(jni::JNIEnv& env, jni::Object<Bitmap> image) {
+    static auto constructor = Snapshot::javaClass.GetConstructor<jni::Object<Bitmap>>(env);
+    return Snapshot::javaClass.New(env, constructor, image);
+}
+
+void Snapshot::registerNative(jni::JNIEnv& env) {
+    // Lookup the class
+    Snapshot::javaClass = *jni::Class<Snapshot>::Find(env).NewGlobalRef(env).release();
+}
+
+jni::Class<Snapshot> Snapshot::javaClass;
+
+
+} // namespace android
+} // namespace mbgl

platform/android/src/snapshotter/snapshot.hpp

@@ -0,0 +1,25 @@
+#pragma once
+
+#include <mbgl/util/noncopyable.hpp>
+
+#include <jni/jni.hpp>
+
+namespace mbgl {
+namespace android {
+
+class Bitmap;
+
+class Snapshot : private mbgl::util::noncopyable {
+public:
+
+    static constexpr auto Name() { return "com/mapbox/mapboxsdk/snapshotter/Snapshot"; };
+
+    static jni::Object<Snapshot> New(jni::JNIEnv&, jni::Object<Bitmap> image);
+
+    static jni::Class<Snapshot> javaClass;
+
+    static void registerNative(jni::JNIEnv&);
+};
+
+} // namespace android
+} // namespace mbgl