From 193cdc42d9865337ae53f4d708bed959c1a196fb Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Fri, 8 Jul 2016 13:12:32 -0300
Subject: [PATCH] Set focus mode properly when scanning QR codes

This simple fix contributed by @m8r-v9bo74 fixed the issue on my Xperia
Pro that could never focus on the QR code before. Focusing and scanning
still works on my other test devices.

Closes #346
---
 .../src/org/briarproject/android/util/CameraView.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/briar-android/src/org/briarproject/android/util/CameraView.java b/briar-android/src/org/briarproject/android/util/CameraView.java
index d3690b1895..52bea8fb8b 100644
--- a/briar-android/src/org/briarproject/android/util/CameraView.java
+++ b/briar-android/src/org/briarproject/android/util/CameraView.java
@@ -159,7 +159,8 @@ public class CameraView extends SurfaceView implements SurfaceHolder.Callback,
 		if (sceneModes.contains(SCENE_MODE_BARCODE)) {
 			LOG.info("Setting scene mode to barcode");
 			params.setSceneMode(SCENE_MODE_BARCODE);
-		} else if (Build.VERSION.SDK_INT >= 14 &&
+		}
+		if (Build.VERSION.SDK_INT >= 14 &&
 				focusModes.contains(FOCUS_MODE_CONTINUOUS_PICTURE)) {
 			LOG.info("Setting focus mode to continuous picture");
 			params.setFocusMode(FOCUS_MODE_CONTINUOUS_PICTURE);
-- 
GitLab