From 209700dc72c000493086be31bffd7b61d1d8c772 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 28 May 2018 22:43:38 +0200 Subject: [PATCH] toggle Camera availability when appropriate --- .../com/simplemobiletools/camera/views/PreviewCameraTwo.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt b/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt index 9d506965..62d36ae7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/views/PreviewCameraTwo.kt @@ -239,18 +239,21 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie mCameraOpenCloseLock.release() mCameraDevice = cameraDevice createCameraPreviewSession() + mActivity.setIsCameraAvailable(true) } override fun onDisconnected(cameraDevice: CameraDevice) { mCameraOpenCloseLock.release() cameraDevice.close() mCameraDevice = null + mActivity.setIsCameraAvailable(false) } override fun onError(cameraDevice: CameraDevice, error: Int) { mCameraOpenCloseLock.release() cameraDevice.close() mCameraDevice = null + mActivity.setIsCameraAvailable(false) } } @@ -456,9 +459,7 @@ class PreviewCameraTwo : ViewGroup, TextureView.SurfaceTextureListener, MyPrevie override fun deviceOrientationChanged() { } - override fun resumeCamera(): Boolean { - return false - } + override fun resumeCamera() = true override fun onLayout(changed: Boolean, l: Int, t: Int, r: Int, b: Int) {} }