fenix/Simple-Flashlight
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Flashlight.git synced 2024-12-28 01:30:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

add a camera initialization to SOS too

Browse Source
This commit is contained in:
tibbi 2019-08-22 16:33:57 +02:00
parent 1f1f55e8e7
commit d59db59dd4
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt
View File

@ -59,15 +59,8 @@ class MyCameraImpl(val context: Context) {
disableFlashlight()
}
if (!isNougatPlus()) {
if (camera == null) {
initCamera()
}
if (camera == null) {
context.toast(R.string.camera_error)
return false
}
if (!tryInitCamera()) {
return false
}
if (isStroboscopeRunning) {
@ -88,6 +81,10 @@ class MyCameraImpl(val context: Context) {
stopStroboscope()
}
if (!tryInitCamera()) {
return false
}
if (isFlashlightOn) {
disableFlashlight()
}
@ -101,6 +98,20 @@ class MyCameraImpl(val context: Context) {
bus!!.post(Events.StopSOS())
}
private fun tryInitCamera(): Boolean {
if (!isNougatPlus()) {
if (camera == null) {
initCamera()
}
if (camera == null) {
context.toast(R.string.camera_error)
return false
}
}
return true
}
fun handleCameraSetup() {
if (isMarshmallow) {
setupMarshmallowCamera()