From 37a784dc3b6ee272eab00c3696193602df7e43a6 Mon Sep 17 00:00:00 2001
From: Matt Fenlon <nolnefm@gmail.com>
Date: Fri, 26 May 2017 07:40:03 -0700
Subject: [PATCH 1/2] Fixed orientation-related render error in preview
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added two if statements to ensure that orientation detection checks aren’t performed in edit mode.
---
 .../com/flurgle/camerakit/CameraView.java     | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/camerakit/src/main/java/com/flurgle/camerakit/CameraView.java b/camerakit/src/main/java/com/flurgle/camerakit/CameraView.java
index e71b8055..b3ffafb9 100644
--- a/camerakit/src/main/java/com/flurgle/camerakit/CameraView.java
+++ b/camerakit/src/main/java/com/flurgle/camerakit/CameraView.java
@@ -110,13 +110,15 @@ public class CameraView extends FrameLayout {
         setPermissions(mPermissions);
         setVideoQuality(mVideoQuality);
 
-        mDisplayOrientationDetector = new DisplayOrientationDetector(context) {
-            @Override
-            public void onDisplayOrientationChanged(int displayOrientation) {
-                mCameraImpl.setDisplayOrientation(displayOrientation);
-                mPreviewImpl.setDisplayOrientation(displayOrientation);
-            }
-        };
+        if(!isInEditMode()){
+            mDisplayOrientationDetector = new DisplayOrientationDetector(context) {
+                @Override
+                public void onDisplayOrientationChanged(int displayOrientation) {
+                    mCameraImpl.setDisplayOrientation(displayOrientation);
+                    mPreviewImpl.setDisplayOrientation(displayOrientation);
+                }
+            };
+        }
 
         final FocusMarkerLayout focusMarkerLayout = new FocusMarkerLayout(getContext());
         addView(focusMarkerLayout);
@@ -137,11 +139,15 @@ public class CameraView extends FrameLayout {
     @Override
     protected void onAttachedToWindow() {
         super.onAttachedToWindow();
-        mDisplayOrientationDetector.enable(
+
+        if(!isInEditMode()) {
+            mDisplayOrientationDetector.enable(
                 ViewCompat.isAttachedToWindow(this)
-                        ? DisplayManagerCompat.getInstance(getContext()).getDisplay(Display.DEFAULT_DISPLAY)
-                        : null
-        );
+                    ? DisplayManagerCompat.getInstance(getContext())
+                    .getDisplay(Display.DEFAULT_DISPLAY)
+                    : null
+            );
+        }
     }
 
     @Override

From b7b9331b2f2c2379a93813a34bd85ddf0a3b262f Mon Sep 17 00:00:00 2001
From: Matt Fenlon <nolnefm@gmail.com>
Date: Fri, 26 May 2017 09:15:24 -0700
Subject: [PATCH 2/2] Fixed crash if takePhoto called rapidly+repeatedly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There was no check to confirm whether the camera was in process of taking a photo, or if camera instance itself was null. When rapidly called in the demo app (or any other implementing app) this would cause “java.lang.RuntimeException: takePicture failed” or a NPE respectively.
---
 .../api16/com/flurgle/camerakit/Camera1.java  | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java b/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java
index ca9e1f48..ea542997 100644
--- a/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java
+++ b/camerakit/src/main/api16/com/flurgle/camerakit/Camera1.java
@@ -6,6 +6,7 @@ import android.hardware.Camera;
 import android.media.CamcorderProfile;
 import android.media.MediaRecorder;
 import android.os.Handler;
+import android.util.Log;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.View;
@@ -29,6 +30,8 @@ import static com.flurgle.camerakit.CameraKit.Constants.METHOD_STILL;
 @SuppressWarnings("deprecation")
 public class Camera1 extends CameraImpl {
 
+    private static final String TAG = Camera1.class.getSimpleName();
+
     private static final int FOCUS_AREA_SIZE_DEFAULT = 300;
     private static final int FOCUS_METERING_AREA_WEIGHT_DEFAULT = 1000;
     private static final int DELAY_MILLIS_BEFORE_RESETTING_FOCUS = 3000;
@@ -42,6 +45,7 @@ public class Camera1 extends CameraImpl {
     private MediaRecorder mMediaRecorder;
     private File mVideoFile;
     private Camera.AutoFocusCallback mAutofocusCallback;
+    private boolean capturingImage = false;
 
     private int mDisplayOrientation;
 
@@ -208,13 +212,31 @@ public class Camera1 extends CameraImpl {
     void captureImage() {
         switch (mMethod) {
             case METHOD_STANDARD:
-                mCamera.takePicture(null, null, null, new Camera.PictureCallback() {
-                    @Override
-                    public void onPictureTaken(byte[] data, Camera camera) {
-                        mCameraListener.onPictureTaken(data);
-                        camera.startPreview();
-                    }
-                });
+
+                // Null check required for camera here as is briefly null when View is detached
+                if (!capturingImage && mCamera != null) {
+
+                    // Set boolean to wait for image callback
+                    capturingImage = true;
+
+                    mCamera.takePicture(null, null, null,
+                        new Camera.PictureCallback() {
+
+                            @Override
+                            public void onPictureTaken(byte[] data, Camera camera) {
+
+                                mCameraListener.onPictureTaken(data);
+
+                                // Reset capturing state to allow photos to be taken
+                                capturingImage = false;
+
+                                camera.startPreview();
+                            }
+                        });
+                }
+                else {
+                    Log.w(TAG, "Unable, waiting for picture to be taken");
+                }
                 break;
 
             case METHOD_STILL: