Skip to content

Commit 665626e

Browse files
committed
fixing some crashes, mostly on Android 5
1 parent 5931767 commit 665626e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ class MyCameraImpl(val context: Context) {
185185
if (isMarshmallow) {
186186
toggleMarshmallowFlashlight(true)
187187
} else {
188-
if (camera == null || params == null) {
188+
if (camera == null || params == null || camera!!.parameters == null) {
189189
return
190190
}
191191

@@ -206,7 +206,7 @@ class MyCameraImpl(val context: Context) {
206206
if (isMarshmallow) {
207207
toggleMarshmallowFlashlight(false)
208208
} else {
209-
if (camera == null || params == null) {
209+
if (camera == null || params == null || camera!!.parameters == null) {
210210
return
211211
}
212212

@@ -270,7 +270,7 @@ class MyCameraImpl(val context: Context) {
270270
initCamera()
271271
}
272272

273-
val torchOn = camera!!.parameters
273+
val torchOn = camera!!.parameters ?: return@Runnable
274274
val torchOff = camera!!.parameters
275275
torchOn.flashMode = Camera.Parameters.FLASH_MODE_TORCH
276276
torchOff.flashMode = Camera.Parameters.FLASH_MODE_OFF

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class MyTileService : TileService() {
2727
}
2828

2929
private fun updateTile() {
30-
qsTile.state = if (MyCameraImpl.isFlashlightOn) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE
31-
qsTile.updateTile()
30+
qsTile?.state = if (MyCameraImpl.isFlashlightOn) Tile.STATE_ACTIVE else Tile.STATE_INACTIVE
31+
qsTile?.updateTile()
3232
}
3333
}

0 commit comments

Comments
 (0)