Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 12:19:54 +01:00
Code Issues Projects Releases Wiki Activity

Don't crash if camera is reopened or surface is recreated.

Browse Source
This commit is contained in:
akwizgran
2016-11-09 12:37:38 +00:00
parent 138a6e11a7
commit bb82bd70e2
3 changed files with 62 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
briar-android/src/org/briarproject/android/util/QrCodeDecoder.java
View File

@@ -28,7 +28,7 @@ public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
private final Reader reader = new QRCodeReader();
private final ResultCallback callback;
private boolean stopped = false;
private Camera camera = null;
public QrCodeDecoder(ResultCallback callback) {
this.callback = callback;
@@ -36,37 +36,33 @@ public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
@Override
public void start(Camera camera) {
stopped = false;
askForPreviewFrame(camera);
this.camera = camera;
askForPreviewFrame();
}
@Override
public void stop() {
stopped = true;
camera = null;
}
@UiThread
private void askForPreviewFrame(Camera camera) {
if (!stopped) camera.setOneShotPreviewCallback(this);
private void askForPreviewFrame() {
if (camera != null) camera.setOneShotPreviewCallback(this);
}
@UiThread
@Override
public void onPreviewFrame(byte[] data, Camera camera) {
if (!stopped) {
Size size = camera.getParameters().getPreviewSize();
new DecoderTask(camera, data, size.width, size.height).execute();
}
Size size = camera.getParameters().getPreviewSize();
new DecoderTask(data, size.width, size.height).execute();
}
private class DecoderTask extends AsyncTask<Void, Void, Void> {
private final Camera camera;
private final byte[] data;
private final int width, height;
DecoderTask(Camera camera, byte[] data, int width, int height) {
this.camera = camera;
DecoderTask(byte[] data, int width, int height) {
this.data = data;
this.width = width;
this.height = height;
@@ -84,7 +80,7 @@ public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
} catch (ReaderException e) {
return null; // No barcode found
} catch (RuntimeException e) {
return null; // Decoding failed due to bug in decoder
return null; // Preview data did not match width and height
} finally {
reader.reset();
}
@@ -97,7 +93,7 @@ public class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
@Override
protected void onPostExecute(Void result) {
askForPreviewFrame(camera);
askForPreviewFrame();
}
}