From 20b2a73feb6c228ee4436969690cdd16fa9268df Mon Sep 17 00:00:00 2001
From: Richard Chang <chiel99@gmail.com>
Date: Wed, 28 Aug 2019 11:25:51 +0800
Subject: [PATCH] Fix NullPointerException when getting camera preview
 resolution
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Logcat:
java.lang.NullPointerException: Attempt to invoke virtual method ‘int com.wonderkiln.camerakit.Size.getHeight()’ on a null object reference
       at com.wonderkiln.camerakit.Camera1.getPreviewResolution(Camera1.java:599)
       at com.wonderkiln.camerakit.CameraView.getPreviewSize(CameraView.java:518)
       at com.wonderkiln.camerakit.CameraView.onMeasure(CameraView.java:197)
---
 camerakit/src/main/api16/com/wonderkiln/camerakit/Camera1.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camerakit/src/main/api16/com/wonderkiln/camerakit/Camera1.java b/camerakit/src/main/api16/com/wonderkiln/camerakit/Camera1.java
index ddb6f62bc8..12887c6d1d 100644
--- a/camerakit/src/main/api16/com/wonderkiln/camerakit/Camera1.java
+++ b/camerakit/src/main/api16/com/wonderkiln/camerakit/Camera1.java
@@ -588,7 +588,7 @@ Size getVideoResolution() {
     Size getPreviewResolution() {
         Size cameraPreviewResolution = getCameraPreviewResolution();
         boolean invertPreviewSizes = (mCameraInfo.orientation + mDeviceOrientation) % 180 == 90;
-        if (invertPreviewSizes) {
+        if (invertPreviewSizes && cameraPreviewResolution != null) {
             return new Size(cameraPreviewResolution.getHeight(), cameraPreviewResolution.getWidth());
         }
         return cameraPreviewResolution;