Merge pull request #12 from brightec/fix/#10

#10
brightec · Apr 8, 2019 · 87daf06 · 87daf06
2 parents 80df518 + 8bee734
commit 87daf06
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 25 deletions.
diff --git a/kbarcode/src/main/java/uk/co/brightec/kbarcode/camera/Camera2Source.kt b/kbarcode/src/main/java/uk/co/brightec/kbarcode/camera/Camera2Source.kt
@@ -118,33 +118,40 @@ internal class Camera2Source(
         surfaces: List<Surface>,
         listener: OnCameraReadyListener?
     ) {
-        cameraDevice?.createCaptureSession(
-            surfaces, object : CameraCaptureSession.StateCallback() {
-                override fun onConfigured(session: CameraCaptureSession) {
-                    if (cameraDevice == null) return
-                    @Suppress("UnsafeCallOnNullableType")
-                    val builder = cameraDevice!!.createCaptureRequest(
-                        CameraDevice.TEMPLATE_PREVIEW
-                    )
-                    val autoFocus = selectBestAutoFocus()
-                    if (autoFocus != null) {
-                        builder.set(CaptureRequest.CONTROL_AF_MODE, autoFocus)
+        try {
+            cameraDevice?.createCaptureSession(
+                surfaces, object : CameraCaptureSession.StateCallback() {
+                    override fun onConfigured(session: CameraCaptureSession) {
+                        if (cameraDevice == null) return
+                        @Suppress("UnsafeCallOnNullableType")
+                        val builder = cameraDevice!!.createCaptureRequest(
+                            CameraDevice.TEMPLATE_PREVIEW
+                        )
+                        val autoFocus = selectBestAutoFocus()
+                        if (autoFocus != null) {
+                            builder.set(CaptureRequest.CONTROL_AF_MODE, autoFocus)
+                        }
+                        for (surface in surfaces) {
+                            builder.addTarget(surface)
+                        }
+                        session.setRepeatingRequest(builder.build(), null, null)
                     }
-                    for (surface in surfaces) {
-                        builder.addTarget(surface)
+
+                    override fun onConfigureFailed(session: CameraCaptureSession) {
+                        release()
+                        val exception = CameraSessionException()
+                        Timber.e(exception, "Error creating camera session")
+                        listener?.onCameraFailure(exception)
                     }
-                    session.setRepeatingRequest(builder.build(), null, null)
-                }
-
-                override fun onConfigureFailed(session: CameraCaptureSession) {
-                    release()
-                    val exception = CameraSessionException()
-                    Timber.e(exception, "Error creating camera session")
-                    listener?.onCameraFailure(exception)
-                }
-            },
-            null
-        )
+                },
+                null
+            )
+        } catch (e: android.hardware.camera2.CameraAccessException) {
+            release()
+            val exception = CameraAccessException()
+            Timber.e(exception, "Error creating camera session")
+            listener?.onCameraFailure(exception)
+        }
     }
 
     /**

diff --git a/kbarcode/src/main/java/uk/co/brightec/kbarcode/camera/CameraException.kt b/kbarcode/src/main/java/uk/co/brightec/kbarcode/camera/CameraException.kt
@@ -58,3 +58,10 @@ class CameraServiceException : CameraException()
  * @see android.hardware.camera2.CameraCaptureSession.StateCallback.onConfigureFailed
  */
 class CameraSessionException : CameraException()
+
+/**
+ * If the camera device is no longer connected or has encountered a fatal error
+ *
+ * @see android.hardware.camera2.CameraDevice.createCaptureSession
+ */
+class CameraAccessException : CameraException()
diff --git a/kbarcode/src/test/java/uk/co/brightec/kbarcode/camera/Camera2SourceTest.kt b/kbarcode/src/test/java/uk/co/brightec/kbarcode/camera/Camera2SourceTest.kt
@@ -16,6 +16,7 @@ import com.nhaarman.mockitokotlin2.anyOrNull
 import com.nhaarman.mockitokotlin2.argumentCaptor
 import com.nhaarman.mockitokotlin2.doNothing
 import com.nhaarman.mockitokotlin2.doReturn
+import com.nhaarman.mockitokotlin2.doThrow
 import com.nhaarman.mockitokotlin2.eq
 import com.nhaarman.mockitokotlin2.mock
 import com.nhaarman.mockitokotlin2.never
@@ -360,6 +361,23 @@ internal class Camera2SourceTest {
         verify(listener).onCameraFailure(any<CameraSessionException>())
     }
 
+    @Test
+    fun cameraDevice_configurationException__createCaptureSession__release_callsListener() {
+        // GIVEN
+        cameraSource.cameraDevice = cameraDevice
+        whenever(cameraDevice.createCaptureSession(any(), any(), anyOrNull()))
+            .doThrow(mock<android.hardware.camera2.CameraAccessException>())
+
+        // WHEN
+        val surfaces = listOf<Surface>(mock(), mock())
+        val listener = mock<OnCameraReadyListener>()
+        cameraSource.createCaptureSession(surfaces, listener)
+
+        // THEN
+        verify(cameraSource).release()
+        verify(listener).onCameraFailure(any<CameraAccessException>())
+    }
+
     @Test
     fun sizesWithAboveAndBelow_minWidth__chooseOutputSize__lowestAboveMin() {
         // GIVEN