mirror of
https://github.com/SimpleMobileTools/Simple-Flashlight.git
synced 2025-06-05 21:59:19 +02:00
fixing some crashes, mostly on Android 5
This commit is contained in:
@@ -185,7 +185,7 @@ class MyCameraImpl(val context: Context) {
|
||||
if (isMarshmallow) {
|
||||
toggleMarshmallowFlashlight(true)
|
||||
} else {
|
||||
if (camera == null || params == null) {
|
||||
if (camera == null || params == null || camera!!.parameters == null) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -206,7 +206,7 @@ class MyCameraImpl(val context: Context) {
|
||||
if (isMarshmallow) {
|
||||
toggleMarshmallowFlashlight(false)
|
||||
} else {
|
||||
if (camera == null || params == null) {
|
||||
if (camera == null || params == null || camera!!.parameters == null) {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -270,7 +270,7 @@ class MyCameraImpl(val context: Context) {
|
||||
initCamera()
|
||||
}
|
||||
|
||||
val torchOn = camera!!.parameters
|
||||
val torchOn = camera!!.parameters ?: return@Runnable
|
||||
val torchOff = camera!!.parameters
|
||||
torchOn.flashMode = Camera.Parameters.FLASH_MODE_TORCH
|
||||
torchOff.flashMode = Camera.Parameters.FLASH_MODE_OFF
|
||||
|
@@ -27,7 +27,7 @@ class MyTileService : TileService() {
|
||||
}
|
||||
|
||||
private fun updateTile() {
|
||||
qsTile.state = if (MyCameraImpl.isFlashlightOn) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE
|
||||
qsTile.updateTile()
|
||||
qsTile?.state = if (MyCameraImpl.isFlashlightOn) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE
|
||||
qsTile?.updateTile()
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user