From 78949bb0a8818bf6c68f57600cf88907d9f3de6a Mon Sep 17 00:00:00 2001 From: tibbi Date: Sat, 4 Nov 2017 23:49:11 +0100 Subject: [PATCH] catch exceptions thrown by takePicture --- .../com/simplemobiletools/camera/Preview.kt | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt b/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt index 471aa679..c20cf469 100644 --- a/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt +++ b/app/src/main/kotlin/com/simplemobiletools/camera/Preview.kt @@ -283,15 +283,18 @@ class Preview : ViewGroup, SurfaceHolder.Callback, MediaScannerConnection.OnScan mCamera!!.parameters = mParameters isWaitingForTakePictureCallback = true mIsPreviewShown = true - mCamera!!.takePicture(null, null, takePictureCallback) + try { + mCamera!!.takePicture(null, null, takePictureCallback) - if (config.isSoundEnabled) { - val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager - val volume = audioManager.getStreamVolume(AudioManager.STREAM_SYSTEM) - if (volume != 0) { - val mp = MediaPlayer.create(context, Uri.parse("file:///system/media/audio/ui/camera_click.ogg")) - mp?.start() + if (config.isSoundEnabled) { + val audioManager = context.getSystemService(Context.AUDIO_SERVICE) as AudioManager + val volume = audioManager.getStreamVolume(AudioManager.STREAM_SYSTEM) + if (volume != 0) { + val mp = MediaPlayer.create(context, Uri.parse("file:///system/media/audio/ui/camera_click.ogg")) + mp?.start() + } } + } catch (ignored: Exception) { } } mCanTakePicture = false