From 74ecdec6372a3b63d79933982c2ed849044223f1 Mon Sep 17 00:00:00 2001 From: Alexander Bakker Date: Sat, 3 Dec 2022 21:19:02 +0100 Subject: [PATCH] Ignore any menu clicks before the camera is ready in ScannerActivity --- .../java/com/beemdevelopment/aegis/ui/ScannerActivity.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java b/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java index 018dbeef..d534c3dd 100644 --- a/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java +++ b/app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java @@ -109,6 +109,10 @@ public class ScannerActivity extends AegisActivity implements QrCodeAnalyzer.Lis @Override public boolean onOptionsItemSelected(MenuItem item) { + if (_cameraProvider == null) { + return false; + } + if (item.getItemId() == R.id.action_camera) { unbindPreview(_cameraProvider); _currentLens = _currentLens == CameraSelector.LENS_FACING_BACK ? CameraSelector.LENS_FACING_FRONT : CameraSelector.LENS_FACING_BACK;