Haven is for people who need a way to protect their personal spaces and possessions without compromising their own privacy, through an Android app and on-device sensors
fix more camera state issues found in Android 4.1
n8fr807f1c5f8d730
diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.javaindex 3df6d6e..268397f 100644--- a/src/main/java/org/havenapp/main/MonitorActivity.java+++ b/src/main/java/org/havenapp/main/MonitorActivity.java@@ -174,16 +174,6 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDialmFragmentCamera.stopCamera();startActivityForResult(new Intent(this, CameraConfigureActivity.class),REQUEST_CAMERA);- /**- String camera = preferences.getCamera();- if (camera.equals(PreferenceManager.FRONT))- preferences.setCamera(PreferenceManager.BACK);- else if (camera.equals(PreferenceManager.BACK))- preferences.setCamera(PreferenceManager.FRONT);-- ((CameraFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_camera)).resetCamera();- **/-}diff --git a/src/main/java/org/havenapp/main/sensors/motion/Preview.java b/src/main/java/org/havenapp/main/sensors/motion/Preview.javaindex 17ef545..58adba1 100644--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java@@ -145,6 +145,8 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {*/public void surfaceCreated(SurfaceHolder holder) {+ if (camera != null)+ stopCamera();/** The Surface has been created, acquire the camera and tell it where* to draw.@@ -167,7 +169,6 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {}break;case PreferenceManager.BACK:-camera = Camera.open();cameraFacing = Camera.CameraInfo.CAMERA_FACING_BACK;break;@@ -346,7 +347,9 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {// Surface will be destroyed when we return, so stop the preview.// Because the CameraDevice object is not a shared resource, it's very// important to release it when the activity is paused.- context.unbindService(mConnection);+ if (serviceMessenger != null)+ context.unbindService(mConnection);+camera.setPreviewCallback(null);camera.stopPreview();camera.release();