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

fixing some crashes, mostly on Android 5

Browse Source
This commit is contained in:
tibbi
2020-11-07 18:43:32 +01:00
parent 5931767faa
commit 665626e53c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -185,7 +185,7 @@ class MyCameraImpl(val context: Context) {
if (isMarshmallow) { if (isMarshmallow) {
toggleMarshmallowFlashlight(true) toggleMarshmallowFlashlight(true)
} else { } else {
if (camera == null || params == null) { if (camera == null || params == null || camera!!.parameters == null) {
return return
} }
@@ -206,7 +206,7 @@ class MyCameraImpl(val context: Context) {
if (isMarshmallow) { if (isMarshmallow) {
toggleMarshmallowFlashlight(false) toggleMarshmallowFlashlight(false)
} else { } else {
if (camera == null || params == null) { if (camera == null || params == null || camera!!.parameters == null) {
return return
} }
@@ -270,7 +270,7 @@ class MyCameraImpl(val context: Context) {
initCamera() initCamera()
} }
val torchOn = camera!!.parameters val torchOn = camera!!.parameters ?: return@Runnable
val torchOff = camera!!.parameters val torchOff = camera!!.parameters
torchOn.flashMode = Camera.Parameters.FLASH_MODE_TORCH torchOn.flashMode = Camera.Parameters.FLASH_MODE_TORCH
torchOff.flashMode = Camera.Parameters.FLASH_MODE_OFF torchOff.flashMode = Camera.Parameters.FLASH_MODE_OFF

4
app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyTileService.kt
View File

@@ -27,7 +27,7 @@ class MyTileService : TileService() {
} }
private fun updateTile() { private fun updateTile() {
qsTile.state = if (MyCameraImpl.isFlashlightOn) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE qsTile?.state = if (MyCameraImpl.isFlashlightOn) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE
qsTile.updateTile() qsTile?.updateTile()
} }
} }