little fix in plugin, little fix for qr scanner

AppShed · Jul 9, 2015 · 3b30c37 · 3b30c37
1 parent 8f02803
commit 3b30c37
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 10 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/libraries/library_1_3.xml b/.idea/libraries/library_1_3.xml
diff --git a/.idea/libraries/library_2_4_1.xml b/.idea/libraries/library_2_4_1.xml
diff --git a/.idea/libraries/support_annotations_20_0_0.xml b/.idea/libraries/support_annotations_20_0_0.xml
diff --git a/.idea/libraries/support_v13_20_0_0.xml b/.idea/libraries/support_v13_20_0_0.xml
diff --git a/.idea/libraries/support_v4_20_0_0.xml b/.idea/libraries/support_v4_20_0_0.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,6 +19,7 @@
 
 	<uses-feature android:name="android.hardware.camera"/>
 	<uses-feature android:name="android.hardware.camera.autofocus"/>
+	<uses-feature android:name="android.hardware.camera.front" android:required="false" />
 
 	<application
 		android:name="com.appshed.store.applications.AppStoreApplication"

diff --git a/app/src/main/java/com/appshed/store/activities/CameraPreview.java b/app/src/main/java/com/appshed/store/activities/CameraPreview.java
@@ -63,7 +63,7 @@ public void surfaceCreated(SurfaceHolder holder) {
 		// The Surface has been created, now tell the camera where to draw the preview.
 		try {
 			mCamera.setPreviewDisplay(holder);
-		} catch (IOException e) {
+		} catch (Exception e) {
 			Log.d("DBG", "Error setting camera preview: " + e.getMessage());
 		}
 	}

diff --git a/app/src/main/java/com/appshed/store/activities/QRScanerActivity.java b/app/src/main/java/com/appshed/store/activities/QRScanerActivity.java
@@ -72,7 +72,7 @@ public void onPause() {
 	public static Camera getCameraInstance() {
 		Camera c = null;
 		try {
-			c = Camera.open();
+			c = Camera.open(0);
 		} catch (Exception e) {
 		}
 		return c;