From 2fe69af6d82ec93e2f9551e44c4e091e347b5d51 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Wed, 9 Nov 2016 14:51:05 +0000
Subject: [PATCH] Don't try to get parameters after releasing camera.
---
.../src/org/briarproject/android/util/QrCodeDecoder.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/util/QrCodeDecoder.java b/briar-android/src/org/briarproject/android/util/QrCodeDecoder.java
index d2f2e750ce..0e9530c087 100644
--- a/briar-android/src/org/briarproject/android/util/QrCodeDecoder.java
+++ b/briar-android/src/org/briarproject/android/util/QrCodeDecoder.java
@@ -53,8 +53,10 @@ public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
@UiThread
@Override
public void onPreviewFrame(byte[] data, Camera camera) {
- Size size = camera.getParameters().getPreviewSize();
- new DecoderTask(data, size.width, size.height).execute();
+ if (camera == this.camera) {
+ Size size = camera.getParameters().getPreviewSize();
+ new DecoderTask(data, size.width, size.height).execute();
+ }
}
private class DecoderTask extends AsyncTask<Void, Void, Void> {
--
GitLab