fenix/Simple-Flashlight
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Flashlight.git synced 2025-02-06 13:13:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

catch all exceptions at MarshmallowCamera

Browse Source
This commit is contained in:
tibbi 2018-01-24 22:50:40 +01:00
parent 6a702ac2d2
commit 10dcb51cae
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MarshmallowCamera.kt
View File

@ -2,7 +2,6 @@ package com.simplemobiletools.flashlight.helpers
import android.annotation.TargetApi import android.annotation.TargetApi
import android.content.Context import android.content.Context
import android.hardware.camera2.CameraAccessException
import android.hardware.camera2.CameraManager import android.hardware.camera2.CameraManager
import android.os.Build import android.os.Build
import android.os.Handler import android.os.Handler
@ -18,7 +17,7 @@ internal class MarshmallowCamera constructor(val context: Context) {
init { init {
try { try {
cameraId = manager.cameraIdList[0] ?: "0" cameraId = manager.cameraIdList[0] ?: "0"
} catch (ignored: CameraAccessException) { } catch (ignored: Exception) {
} }
} }
@ -26,7 +25,7 @@ internal class MarshmallowCamera constructor(val context: Context) {
fun toggleMarshmallowFlashlight(bus: Bus, enable: Boolean) { fun toggleMarshmallowFlashlight(bus: Bus, enable: Boolean) {
try { try {
manager.setTorchMode(cameraId!!, enable) manager.setTorchMode(cameraId!!, enable)
} catch (e: CameraAccessException) { } catch (e: Exception) {
val mainRunnable = Runnable { val mainRunnable = Runnable {
bus.post(Events.CameraUnavailable()) bus.post(Events.CameraUnavailable())
} }

2
build.gradle
View File

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript { buildscript {
ext.kotlin_version = '1.2.20' ext.kotlin_version = '1.2.21'
repositories { repositories {
jcenter() jcenter()