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

Merge branch '1002-cam-get-params-npe' into 'master'

Browse Source 
Catch RuntimeException when getting camera parameters

See merge request !579
This commit is contained in:
akwizgran
2017-08-01 13:56:45 +00:00
parent 6702df1e22 1aa33ec9b2
commit 69bfb72171
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
briar-android/src/main/java/org/briarproject/briar/android/keyagreement/QrCodeDecoder.java
View File

@@ -22,6 +22,7 @@ import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
import java.util.logging.Logger; import java.util.logging.Logger;
import static java.util.logging.Level.INFO; import static java.util.logging.Level.INFO;
import static java.util.logging.Level.WARNING;
@SuppressWarnings("deprecation") @SuppressWarnings("deprecation")
@MethodsNotNullByDefault @MethodsNotNullByDefault
@@ -60,8 +61,12 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
@Override @Override
public void onPreviewFrame(byte[] data, Camera camera) { public void onPreviewFrame(byte[] data, Camera camera) {
if (camera == this.camera) { if (camera == this.camera) {
Size size = camera.getParameters().getPreviewSize(); try {
new DecoderTask(data, size.width, size.height).execute(); Size size = camera.getParameters().getPreviewSize();
new DecoderTask(data, size.width, size.height).execute();
} catch (RuntimeException e) {
LOG.log(WARNING, "Error getting camera parameters.", e);
}
} }
} }
@@ -70,7 +75,7 @@ class QrCodeDecoder implements PreviewConsumer, PreviewCallback {
private final byte[] data; private final byte[] data;
private final int width, height; private final int width, height;
DecoderTask(byte[] data, int width, int height) { private DecoderTask(byte[] data, int width, int height) {
this.data = data; this.data = data;
this.width = width; this.width = width;
this.height = height; this.height = height;