From: Nathaniel McCallum <npmccallum@redhat.com>
Date: Mon, 16 Dec 2013 17:46:50 +0000 (-0500)
Subject: Use first camera if no back camera is present
X-Git-Url: http://pileus.org/git/?p=~andy%2Ffreeotp;a=commitdiff_plain;h=a80af12864b08b59ef6592ed3463ee7f1000a0ab

Use first camera if no back camera is present
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6d2426f..3a5b842 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -21,7 +21,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.fedorahosted.freeotp"
-    android:versionCode="10"
+    android:versionCode="11"
     android:versionName="1.3" >
 
     <uses-sdk
diff --git a/src/org/fedorahosted/freeotp/CameraDialogFragment.java b/src/org/fedorahosted/freeotp/CameraDialogFragment.java
index 1e48159..80c6c9b 100644
--- a/src/org/fedorahosted/freeotp/CameraDialogFragment.java
+++ b/src/org/fedorahosted/freeotp/CameraDialogFragment.java
@@ -52,9 +52,9 @@ public class CameraDialogFragment extends BaseAlertDialogFragment
 		super(R.string.scan_qr_code, R.layout.camera,
 			android.R.string.cancel, R.string.manual_entry, 0);
 
-		// Find a back-facing camera
+		// Find a back-facing camera, otherwise use the first camera.
 		int cameraId;
-		for (cameraId = Camera.getNumberOfCameras() - 1; cameraId >= 0; cameraId--) {
+		for (cameraId = Camera.getNumberOfCameras() - 1; cameraId > 0; cameraId--) {
 			Camera.getCameraInfo(cameraId, mCameraInfo);
 			if (mCameraInfo.facing == CameraInfo.CAMERA_FACING_BACK)
 				break;
@@ -77,7 +77,7 @@ public class CameraDialogFragment extends BaseAlertDialogFragment
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 
-		// If we have no back facing camera, open the manual dialog
+		// If we have no cameras, open the manual dialog
 		if (mCameraId < 0) {
 			new ManualDialogFragment().show(getFragmentManager(),
 					ManualDialogFragment.FRAGMENT_TAG);