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
Merge branch 'master' into video-recording-dev
percy-g208daedef85a9
diff --cc src/main/java/org/havenapp/main/sensors/motion/Preview.javaindex 96ec3fa,58adba1..abc747a--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java@@@ -47,55 -43,60 +47,60 @@@ import java.util.Dateimport java.util.List;public class Preview extends SurfaceView implements SurfaceHolder.Callback {-- /**- * Object to retrieve and set shared preferences- */- private PreferenceManager prefs;- private int cameraFacing = 0;- private final static int PREVIEW_INTERVAL = 500;-- private List<MotionAsyncTask.MotionListener> listeners = new ArrayList<>();-- /**- * Timestamp of the last picture processed- */- private long lastTimestamp;- /**- * Last picture processed- */- private byte[] lastPic;- /**- * True IFF there's an async task processing images- */- private boolean doingProcessing;+ /**+ * Object to retrieve and set shared preferences+ */+ private PreferenceManager prefs;+ private int cameraFacing = 0;++ private final static int PREVIEW_INTERVAL = 500;++ private List<MotionAsyncTask.MotionListener> listeners = new ArrayList<>();++ /**+ * Timestamp of the last picture processed+ */+ private long lastTimestamp;+ /**+ * Last picture processed+ */+ private byte[] lastPic;+ /**+ * True IFF there's an async task processing images+ */+ private boolean doingProcessing, doingVideoProcessing = false;- /**- * Handler used to update back the UI after motion detection- */- private final Handler updateHandler = new Handler();-- /**- * Last frame captured- */- private int imageCount = 0;-- /**- * Sensitivity of motion detection- */- private int motionSensitivity = LuminanceMotionDetector.MOTION_MEDIUM;-- /**- * Messenger used to signal motion to the alert service- */- private Messenger serviceMessenger = null;- private MediaRecorder mediaRecorder = null;- private ServiceConnection mConnection = new ServiceConnection() {+ /**+ * Handler used to update back the UI after motion detection+ */+ private final Handler updateHandler = new Handler();++ /**+ * Last frame captured+ */+ private int imageCount = 0;++ /**+ * Sensitivity of motion detection+ */+ private int motionSensitivity = LuminanceMotionDetector.MOTION_MEDIUM;++ /**+ * Messenger used to signal motion to the alert service+ */+ private Messenger serviceMessenger = null;-- private SurfaceHolder mHolder;++ private MediaRecorder mediaRecorder = null;++ private SurfaceHolder mHolder;+ private Camera camera;+ private Context context;+ private MotionAsyncTask task;-++ private String videoFile;+ private ServiceConnection mConnection = new ServiceConnection() {public void onServiceConnected(ComponentName className,- IBinder service) {- Log.i("CameraFragment", "SERVICE CONNECTED");+ IBinder service) {+ Log.i("CameraFragment", "SERVICE CONNECTED");// We've bound to LocalService, cast the IBinder and get LocalService instanceserviceMessenger = new Messenger(service);}@@@ -148,76 -144,76 +146,77 @@@* in order to minimize CPU usage*/public void surfaceCreated(SurfaceHolder holder) {--+++ if (camera != null)+ stopCamera();/** The Surface has been created, acquire the camera and tell it where* to draw.* If the selected camera is the front one we open it*/- switch (prefs.getCamera()) {- case PreferenceManager.FRONT:- Camera.CameraInfo cameraInfo = new Camera.CameraInfo();- int cameraCount = Camera.getNumberOfCameras();- for (int camIdx = 0; camIdx < cameraCount; camIdx++) {- Camera.getCameraInfo(camIdx, cameraInfo);- if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {- try {- camera = Camera.open(camIdx);- cameraFacing = Camera.CameraInfo.CAMERA_FACING_FRONT;- } catch (RuntimeException e) {- Log.e("Preview", "Camera failed to open: " + e.getLocalizedMessage());- }- }- }- break;- case PreferenceManager.BACK:-- camera = Camera.open();- cameraFacing = Camera.CameraInfo.CAMERA_FACING_BACK;- break;- default:- camera = null;- break;- }+ switch (prefs.getCamera()) {+ case PreferenceManager.FRONT:+ Camera.CameraInfo cameraInfo = new Camera.CameraInfo();+ int cameraCount = Camera.getNumberOfCameras();+ for (int camIdx = 0; camIdx < cameraCount; camIdx++) {+ Camera.getCameraInfo(camIdx, cameraInfo);+ if (cameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) {+ try {+ camera = Camera.open(camIdx);+ cameraFacing = Camera.CameraInfo.CAMERA_FACING_FRONT;+ } catch (RuntimeException e) {+ Log.e("Preview", "Camera failed to open: " + e.getLocalizedMessage());+ }+ }+ }+ break;+ case PreferenceManager.BACK:+++ camera = Camera.open();+ cameraFacing = Camera.CameraInfo.CAMERA_FACING_BACK;+ break;+ default:+ camera = null;+ break;+ }- if (camera != null) {-- final Camera.Parameters parameters = camera.getParameters();+ if (camera != null) {- try {- List<Size> sizesPreviews = parameters.getSupportedPreviewSizes();+ final Camera.Parameters parameters = camera.getParameters();- Size bestSize = sizesPreviews.get(0);+ try {+ List<Size> sizesPreviews = parameters.getSupportedPreviewSizes();- for (int i = 1; i < sizesPreviews.size(); i++) {- if ((sizesPreviews.get(i).width * sizesPreviews.get(i).height) >- (bestSize.width * bestSize.height)) {- bestSize = sizesPreviews.get(i);- }- }+ Size bestSize = sizesPreviews.get(0);- parameters.setPreviewSize(bestSize.width, bestSize.height);+ for (int i = 1; i < sizesPreviews.size(); i++) {+ if ((sizesPreviews.get(i).width * sizesPreviews.get(i).height) >+ (bestSize.width * bestSize.height)) {+ bestSize = sizesPreviews.get(i);+ }+ }- } catch (Exception e) {- Log.w("Camera", "Error setting camera preview size", e);- }+ parameters.setPreviewSize(bestSize.width, bestSize.height);- try {- List<int[]> ranges = parameters.getSupportedPreviewFpsRange();- int[] bestRange = ranges.get(0);- for (int i = 1; i < ranges.size(); i++) {- if (ranges.get(i)[1] >- bestRange[1]) {- bestRange[0] = ranges.get(i)[0];- bestRange[1] = ranges.get(i)[1];+ } catch (Exception e) {+ Log.w("Camera", "Error setting camera preview size", e);+ }- }- }- parameters.setPreviewFpsRange(bestRange[0], bestRange[1]);- }- catch (Exception e) {- Log.w("Camera","Error setting frames per second",e);+ try {+ List<int[]> ranges = parameters.getSupportedPreviewFpsRange();+ int[] bestRange = ranges.get(0);+ for (int i = 1; i < ranges.size(); i++) {+ if (ranges.get(i)[1] >+ bestRange[1]) {+ bestRange[0] = ranges.get(i)[0];+ bestRange[1] = ranges.get(i)[1];++ }+ }+ parameters.setPreviewFpsRange(bestRange[0], bestRange[1]);+ } catch (Exception e) {+ Log.w("Camera", "Error setting frames per second", e);}try {