Fixed a bug causing the app to crash on startup

PhenoApps · Dec 21, 2015 · ef486a6 · ef486a6
1 parent 54c2207
commit ef486a6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 24 deletions.
diff --git a/onekk/src/main/AndroidManifest.xml b/onekk/src/main/AndroidManifest.xml
@@ -11,12 +11,12 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.wheatgenetics.onekk"
-    android:versionCode="100"
-    android:versionName="1.0">
+    android:versionCode="101"
+    android:versionName="1.0.1">
 
     <uses-feature android:name="android.hardware.usb.host" />
     <uses-feature android:name="android.hardware.camera" />
-    <uses-feature android:name="android.hardware.camera.autofocus" />
+    <uses-feature android:name="android.hardware.camera.autofocus" android:required="false" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -37,6 +37,7 @@
             android:launchMode="singleTask"
             android:screenOrientation="sensorPortrait"
             android:windowSoftInputMode="adjustResize">
+
             <intent-filter>
                 <action android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED" />
             </intent-filter>

diff --git a/onekk/src/main/java/org/wheatgenetics/onekk/MainActivity.java b/onekk/src/main/java/org/wheatgenetics/onekk/MainActivity.java
@@ -346,15 +346,16 @@ public void onManagerConnected(int status) {
     private void startCamera() {
         mCamera = getCameraInstance();
 
-        Camera.Parameters params = mCamera.getParameters();
-        params.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
-        mCamera.setParameters(params);
+        PackageManager pm = getPackageManager();
+        if(pm.hasSystemFeature(PackageManager.FEATURE_CAMERA_AUTOFOCUS)){
+            Camera.Parameters params = mCamera.getParameters();
+            params.setFocusMode(Camera.Parameters.FOCUS_MODE_CONTINUOUS_PICTURE);
+            mCamera.setParameters(params);
+        }
 
         // Create our Preview view and set it as the content of our activity.
         mPreview = new CameraPreview(this, mCamera);
         preview.addView(mPreview);
-
-
     }
 
     private void goToTop() {

diff --git a/onekk/src/main/res/raw/changelog_releases.txt b/onekk/src/main/res/raw/changelog_releases.txt
@@ -1,3 +1,6 @@
+3/1.0.1
+Fixed a bug causing the app to crash on startup
+
 2/1.0.0
 Updated with new algorithm
 New material layout

diff --git a/onekk/src/main/res/raw/dev_changelog.txt b/onekk/src/main/res/raw/dev_changelog.txt
@@ -1,3 +1,6 @@
+6
+Fixed a bug that caused crashes on pre Lollipop devices
+
 5
 Added Other Apps dialog
 

diff --git a/onekk/src/main/res/values-v14/styles.xml b/onekk/src/main/res/values-v14/styles.xml
diff --git a/onekk/src/main/res/values-v21/styles.xml b/onekk/src/main/res/values-v21/styles.xml
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,6 @@
		6
		Fixed a bug that caused crashes on pre Lollipop devices

		5
		Added Other Apps dialog

Expand Down