[WIP] fix PR commentsupstream/pg-snapshot-wrapper

3 files changed, 5 insertions, 9 deletions

diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/PrintActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/PrintActivity.java
index f30ff5fdc0..18d80586c9 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/PrintActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/PrintActivity.java
@@ -10,7 +10,6 @@ import android.view.View;
 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;
 
 /**
@@ -49,11 +48,10 @@ public class PrintActivity extends AppCompatActivity implements MapboxMap.Snapsh
   }
 
   @Override
-  public void onSnapshotReady(Snapshot snapshot) {
+  public void onSnapshotReady(Bitmap snapshot) {
     PrintHelper photoPrinter = new PrintHelper(this);
     photoPrinter.setScaleMode(PrintHelper.SCALE_MODE_FIT);
-    Bitmap bitmap = snapshot.getBitmap();
-    photoPrinter.printBitmap("map.jpg - mapbox print job", bitmap);
+    photoPrinter.printBitmap("map.jpg - mapbox print job", snapshot);
   }
 
   @Override
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.java
index d1112afadd..655012f799 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/imagegenerator/SnapshotActivity.java
@@ -13,7 +13,6 @@ import com.mapbox.mapboxsdk.constants.Style;
 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;
@@ -52,12 +51,11 @@ public class SnapshotActivity extends AppCompatActivity implements OnMapReadyCal
     final long startTime = System.nanoTime();
     mapboxMap.snapshot(new MapboxMap.SnapshotReadyCallback() {
       @Override
-      public void onSnapshotReady(Snapshot snapshot) {
+      public void onSnapshotReady(Bitmap snapshot) {
         long endTime = System.nanoTime();
         long duration = (long) ((endTime - startTime) / 1e6);
         ImageView snapshotView = (ImageView) findViewById(R.id.imageView);
-        Bitmap bitmap = snapshot.getBitmap();
-        snapshotView.setImageBitmap(bitmap);
+        snapshotView.setImageBitmap(snapshot);
         Toast.makeText(
           SnapshotActivity.this,
           String.format(Locale.getDefault(), "Snapshot taken in %d ms", duration),
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java
index d0d2feffdc..93e8eab5f0 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/snapshot/MapSnapshotterActivity.java
@@ -97,7 +97,7 @@ public class MapSnapshotterActivity extends AppCompatActivity {
 
     MapSnapshotter snapshotter = new MapSnapshotter(MapSnapshotterActivity.this, options);
 
-    snapshotter.start(new MapboxMap.SnapshotReadyCallback() {
+    snapshotter.start(new MapboxMap.MapSnapshotReadyCallback() {
       @Override
       public void onSnapshotReady(Snapshot snapshot) {
         Timber.i("Got the snapshot");