Skip to content
This repository has been archived by the owner on Oct 10, 2020. It is now read-only.

App crash on orientation change #208 #209

Merged
merged 3 commits into from
Apr 14, 2020
Merged

App crash on orientation change #208 #209

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4378dd
App crash on orientation change #208
subin-ezto Apr 14, 2020
8b1ba06
App crash on orientation change #208
subin-ezto Apr 14, 2020
36fc088
App crash on orientation change #208
subin-ezto Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions android/src/main/kotlin/de/mintware/barcode_scan/BarcodeScannerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
}

private lateinit var config: Protos.Configuration
lateinit var scannerView: ZXingScannerView
private var scannerViewInitialized: Boolean = false
private var scannerView: ZXingScannerView? = null

companion object {
const val TOGGLE_FLASH = 200
Expand Down Expand Up @@ -49,7 +48,7 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
}

private fun setupScannerView() {
if (scannerViewInitialized) {
if (scannerView != null) {
return
}

Expand All @@ -69,13 +68,12 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
}

setContentView(scannerView)
scannerViewInitialized = true
}

// region AppBar menu
override fun onCreateOptionsMenu(menu: Menu): Boolean {
var buttonText = config.stringsMap["flash_on"]
if (scannerView.flash) {
if (scannerView?.flash == true) {
buttonText = config.stringsMap["flash_off"]
}
val item = menu.add(0, TOGGLE_FLASH, 0, buttonText)
Expand All @@ -85,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
}
Expand All @@ -94,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

Expand Down