From 665626e53c4baaf762da9ce126161787f0f9e9bf Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sat, 7 Nov 2020 18:43:32 +0100
Subject: [PATCH] fixing some crashes, mostly on Android 5

---
 .../simplemobiletools/flashlight/helpers/MyCameraImpl.kt    | 6 +++---
 .../simplemobiletools/flashlight/helpers/MyTileService.kt   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt
index 655cc04..027ef95 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyCameraImpl.kt
@@ -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
diff --git a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyTileService.kt b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyTileService.kt
index a2af30e..60306c6 100644
--- a/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyTileService.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/flashlight/helpers/MyTileService.kt
@@ -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()
     }
 }