From f4378ddbe68f015760fd3b39e2b748d51b142e5c Mon Sep 17 00:00:00 2001
From: Subin Selvaraj <subin.selvaraj@grootan.com>
Date: Tue, 14 Apr 2020 17:03:31 +0530
Subject: [PATCH 1/3] App crash on orientation change #208

---
 .../kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt b/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
index aab199b3..10493c28 100644
--- a/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
+++ b/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
@@ -17,7 +17,6 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
 
     private lateinit var config: Protos.Configuration
     lateinit var scannerView: ZXingScannerView
-    private var scannerViewInitialized: Boolean = false
 
     companion object {
         const val TOGGLE_FLASH = 200
@@ -49,7 +48,7 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
     }
 
     private fun setupScannerView() {
-        if (scannerViewInitialized) {
+        if (scannerView != null) {
             return
         }
 
@@ -69,7 +68,6 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
         }
 
         setContentView(scannerView)
-        scannerViewInitialized = true
     }
 
     // region AppBar menu

From 8b1ba065de84610fc2ed78fd6619c0e4f3157f8c Mon Sep 17 00:00:00 2001
From: Subin Selvaraj <subin.selvaraj@grootan.com>
Date: Tue, 14 Apr 2020 17:57:49 +0530
Subject: [PATCH 2/3] App crash on orientation change #208

---
 .../kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt b/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
index 10493c28..4511a18c 100644
--- a/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
+++ b/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
@@ -48,7 +48,7 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
     }
 
     private fun setupScannerView() {
-        if (scannerView != null) {
+        if (this::scannerView.isInitialized) {
             return
         }
 
@@ -73,7 +73,7 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
     // region AppBar menu
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         var buttonText = config.stringsMap["flash_on"]
-        if (scannerView.flash) {
+        if (this::scannerView.isInitialized && scannerView.flash) {
             buttonText = config.stringsMap["flash_off"]
         }
         val item = menu.add(0, TOGGLE_FLASH, 0, buttonText)

From 36fc08837a2977beb4d9835c6666919076b9b0c4 Mon Sep 17 00:00:00 2001
From: Subin Selvaraj <subin.selvaraj@grootan.com>
Date: Tue, 14 Apr 2020 23:21:02 +0530
Subject: [PATCH 3/3] App crash on orientation change #208

---
 .../barcode_scan/BarcodeScannerActivity.kt         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt b/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
index 4511a18c..1797de20 100644
--- a/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
+++ b/android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
@@ -16,7 +16,7 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
     }
 
     private lateinit var config: Protos.Configuration
-    lateinit var scannerView: ZXingScannerView
+    private var scannerView: ZXingScannerView? = null
 
     companion object {
         const val TOGGLE_FLASH = 200
@@ -48,7 +48,7 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
     }
 
     private fun setupScannerView() {
-        if (this::scannerView.isInitialized) {
+        if (scannerView != null) {
             return
         }
 
@@ -73,7 +73,7 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
     // region AppBar menu
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         var buttonText = config.stringsMap["flash_on"]
-        if (this::scannerView.isInitialized && scannerView.flash) {
+        if (scannerView?.flash == true) {
             buttonText = config.stringsMap["flash_off"]
         }
         val item = menu.add(0, TOGGLE_FLASH, 0, buttonText)
@@ -83,7 +83,7 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == TOGGLE_FLASH) {
-            scannerView.toggleFlash()
+            scannerView?.toggleFlash()
             this.invalidateOptionsMenu()
             return true
         }
@@ -92,14 +92,14 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
 
     override fun onPause() {
         super.onPause()
-        scannerView.stopCamera()
+        scannerView?.stopCamera()
     }
 
     override fun onResume() {
         super.onResume()
         setupScannerView()
-        scannerView.setResultHandler(this)
-        scannerView.startCamera()
+        scannerView?.setResultHandler(this)
+        scannerView?.startCamera()
     }
     // endregion