Merge pull request #22 from brightec/fix/SurfaceAbandoned

fix/SurfaceAbandoned:
brightec · Oct 21, 2019 · 80cbf70 · 80cbf70
2 parents dc131b4 + 07590cc
commit 80cbf70
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 1 deletion.
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
@@ -59,6 +59,15 @@ internal class Camera2Source(
             override fun onOpened(camera: CameraDevice) {
                 cameraOpening = false
                 cameraDevice = camera
+
+                if (surfaces.any { !it.isValid }) {
+                    release()
+                    val exception = CameraException()
+                    Timber.e(exception, "Surfaces no longer valid")
+                    listener?.onCameraFailure(exception)
+                    return
+                }
+
                 listener?.onCameraReady()
                 createCaptureSession(
                     surfaces = surfaces,

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
@@ -169,6 +169,32 @@ internal class Camera2SourceTest {
         )
     }
 
+    @Test
+    fun cameraId_cameraOpened_sufacesInvalid__start__setsNotOpening_setCameraDevice_error() {
+        doNothing().whenever(cameraSource).createCaptureSession(any(), any())
+
+        // GIVEN
+        val cameraId = "some id"
+        doReturn(cameraId).whenever(cameraSource).selectCamera()
+        whenever(cameraManager.openCamera(any(), any(), anyOrNull<Handler>())).then {
+            val stateCallback = it.getArgument<CameraDevice.StateCallback>(1)
+            stateCallback.onOpened(cameraDevice)
+        }
+
+        // THEN
+        val surface = mock<Surface> {
+            on { isValid } doReturn false
+        }
+        val surfaces = listOf(surface)
+        val listener = mock<OnCameraReadyListener>()
+        cameraSource.start(surfaces, listener)
+
+        // THEN
+        assertFalse(cameraSource.cameraOpening)
+        verify(cameraSource).cameraDevice = cameraDevice
+        verify(listener).onCameraFailure(any())
+    }
+
     @Test
     fun cameraId_cameraOpened__start__setsNotOpening_setCameraDevice_callListener_createSession() {
         doNothing().whenever(cameraSource).createCaptureSession(any(), any())
@@ -182,7 +208,10 @@ internal class Camera2SourceTest {
         }
 
         // THEN
-        val surfaces = mock<List<Surface>>()
+        val surface = mock<Surface> {
+            on { isValid } doReturn true
+        }
+        val surfaces = listOf(surface)
         val listener = mock<OnCameraReadyListener>()
         cameraSource.start(surfaces, listener)