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
video monitoring ;)
percy-g24dd10021e7f6
diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.javaindex f468852..8c8f6d4 100644--- a/src/main/java/org/havenapp/main/PreferenceManager.java+++ b/src/main/java/org/havenapp/main/PreferenceManager.java@@ -148,7 +148,16 @@ public class PreferenceManager {public String getAccelerometerSensitivity() {return appSharedPrefs.getString(ACCELEROMETER_SENSITIVITY, HIGH);}-++ public void setActivateVideoMonitoring(boolean active) {+ prefsEditor.putBoolean(context.getResources().getString(R.string.video_active_preference_key), active);+ prefsEditor.commit();+ }++ public boolean getVideoMonitoringActive() {+ return appSharedPrefs.getBoolean(context.getResources().getString(R.string.video_active_preference_key), false);+ }+public void activateCamera(boolean active) {prefsEditor.putBoolean(CAMERA_ACTIVE, active);prefsEditor.commit();diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.javaindex ace220e..e931c9a 100644--- a/src/main/java/org/havenapp/main/SettingsFragment.java+++ b/src/main/java/org/havenapp/main/SettingsFragment.java@@ -12,6 +12,7 @@ import android.content.pm.PackageManager;import android.os.Bundle;import android.os.Environment;import android.support.annotation.NonNull;+import android.support.v14.preference.SwitchPreference;import android.support.v4.app.ActivityCompat;import android.support.v4.content.ContextCompat;import android.support.v7.preference.EditTextPreference;@@ -154,6 +155,10 @@ public class SettingsFragment extends PreferenceFragmentCompat implements SharedsetPhoneNumber();+ boolean videoMonitoringActive = ((SwitchPreference) findPreference(mActivity.getResources().getString(R.string.video_active_preference_key))).isChecked();++ preferences.setActivateVideoMonitoring(videoMonitoringActive);+boolean remoteAccessActive = ((SwitchPreferenceCompat) findPreference(PreferenceManager.REMOTE_ACCESS_ACTIVE)).isChecked();preferences.activateRemoteAccess(remoteAccessActive);diff --git a/src/main/java/org/havenapp/main/model/EventTrigger.java b/src/main/java/org/havenapp/main/model/EventTrigger.javaindex 777fdca..8051680 100644--- a/src/main/java/org/havenapp/main/model/EventTrigger.java+++ b/src/main/java/org/havenapp/main/model/EventTrigger.java@@ -54,6 +54,11 @@ public class EventTrigger extends SugarRecord {*/public static final int BUMP = 6;+ /**+ * Significant motion detected message+ */+ public static final int CAMERA_VIDEO = 7;+public EventTrigger (){@@ -112,6 +117,9 @@ public class EventTrigger extends SugarRecord {case EventTrigger.BUMP:sType = context.getString(R.string.sensor_bump);break;+ case EventTrigger.CAMERA_VIDEO:+ sType = context.getString(R.string.sensor_camera_video);+ break;default:sType = context.getString(R.string.sensor_unknown);}@@ -131,6 +139,9 @@ public class EventTrigger extends SugarRecord {case EventTrigger.MICROPHONE:sType = "audio/*";break;+ case EventTrigger.CAMERA_VIDEO:+ sType = "video/*";+ break;default:sType = null;}diff --git a/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.java b/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.javanew file mode 100644index 0000000..f86aebd--- /dev/null+++ b/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.java@@ -0,0 +1,69 @@+package org.havenapp.main.sensors.media;++import android.hardware.Camera;+import android.media.MediaRecorder;+import android.util.Log;++import java.io.IOException;++/**+ * Created by percy on 14/1/18.+ */++public class MediaRecorderTask {++ private String mOutputFile;+ private android.media.MediaRecorder mMediaRecorder;+ private Camera mCamera;++ public MediaRecorderTask(Camera camera, String fileImageDir) {+ mCamera = camera;+ mOutputFile = fileImageDir;+ if(prepare(mCamera)){+ Log.d("Done", "Media Recorder prepared");+ } else {+ Log.d("Error", "Media Recorder not prepared");+ }+ }++ public MediaRecorder getPreparedMediaRecorder(){++ return mMediaRecorder;+ }++ private boolean prepare(Camera camera) {++ mCamera = camera;+ mMediaRecorder = new MediaRecorder();+ mCamera.unlock();+ mMediaRecorder.setCamera(mCamera);+ mMediaRecorder.setAudioSource(MediaRecorder.AudioSource.MIC);+ mMediaRecorder.setVideoSource(MediaRecorder.VideoSource.DEFAULT);+ mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);+ mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);+ mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.MPEG_4_SP);+ mMediaRecorder.setMaxDuration(5000);+ mMediaRecorder.setOutputFile(mOutputFile);+ try {+ mMediaRecorder.prepare();+ } catch(IllegalStateException e) {+ Log.d("ERROR", "IllegalStateException preparing MediaRecorder: " + e.getMessage());+ releaseMediaRecorder();+ return false;+ } catch (IOException e) {+ Log.d("ERROR", "IOException preparing MediaRecorder: " + e.getMessage());+ releaseMediaRecorder();+ return false;+ }+ return true;+ }++ private void releaseMediaRecorder() {+ if(mMediaRecorder != null){+ mMediaRecorder.reset();+ mMediaRecorder.release();+ mMediaRecorder = null;+ mCamera.lock();+ }+ }+}diff --git a/src/main/java/org/havenapp/main/sensors/motion/Preview.java b/src/main/java/org/havenapp/main/sensors/motion/Preview.javaindex 31afe3d..f5d76b6 100644--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java@@ -18,11 +18,13 @@ import android.hardware.Camera;import android.hardware.Camera.Parameters;import android.hardware.Camera.PreviewCallback;import android.hardware.Camera.Size;+import android.media.MediaRecorder;import android.os.Environment;import android.os.Handler;import android.os.IBinder;import android.os.Message;import android.os.Messenger;+import android.os.RemoteException;import android.util.Log;import android.view.Surface;import android.view.SurfaceHolder;@@ -31,6 +33,7 @@ import android.view.WindowManager;import org.havenapp.main.PreferenceManager;import org.havenapp.main.model.EventTrigger;+import org.havenapp.main.sensors.media.MediaRecorderTask;import org.havenapp.main.sensors.media.MotionAsyncTask;import org.havenapp.main.service.MonitorService;@@ -42,365 +45,387 @@ import java.util.Date;import 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;-- /**- * 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;-++ /**+ * 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() {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);}-+public void onServiceDisconnected(ComponentName arg0) {- Log.i("CameraFragment", "SERVICE DISCONNECTED");+ Log.i("CameraFragment", "SERVICE DISCONNECTED");serviceMessenger = null;}};- private SurfaceHolder mHolder;- private Camera camera;- private Context context;+ private SurfaceHolder mHolder;+ private Camera camera;+ private Context context;++ public Preview(Context context) {+ super(context);+ this.context = context;+ // Install a SurfaceHolder.Callback so we get notified when the+ // underlying surface is created and destroyed.+ mHolder = getHolder();+ mHolder.addCallback(this);+ prefs = new PreferenceManager(context);- public Preview (Context context) {- super(context);- this.context = context;- // Install a SurfaceHolder.Callback so we get notified when the- // underlying surface is created and destroyed.- mHolder = getHolder();- mHolder.addCallback(this);- prefs = new PreferenceManager(context);-/*- * Set sensitivity value+ * Set sensitivity value*/- switch (prefs.getCameraSensitivity()) {- case "Medium":- motionSensitivity = LuminanceMotionDetector.MOTION_MEDIUM;- Log.i("CameraFragment", "Sensitivity set to Medium");- break;- case "Low":- motionSensitivity = LuminanceMotionDetector.MOTION_LOW;- Log.i("CameraFragment", "Sensitivity set to Low");- break;- default:- motionSensitivity = LuminanceMotionDetector.MOTION_HIGH;- Log.i("CameraFragment", "Sensitivity set to High");- break;- }- }-- public void addListener(MotionAsyncTask.MotionListener listener) {- listeners.add(listener);- }--- /**- * Called on the creation of the surface:- * setting camera parameters to lower possible resolution- * (preferred is 640x480)- * in order to minimize CPU usage- */- public void surfaceCreated(SurfaceHolder holder) {+ switch (prefs.getCameraSensitivity()) {+ case "Medium":+ motionSensitivity = LuminanceMotionDetector.MOTION_MEDIUM;+ Log.i("CameraFragment", "Sensitivity set to Medium");+ break;+ case "Low":+ motionSensitivity = LuminanceMotionDetector.MOTION_LOW;+ Log.i("CameraFragment", "Sensitivity set to Low");+ break;+ default:+ motionSensitivity = LuminanceMotionDetector.MOTION_HIGH;+ Log.i("CameraFragment", "Sensitivity set to High");+ break;+ }+ }++ public void addListener(MotionAsyncTask.MotionListener listener) {+ listeners.add(listener);+ }+++ /**+ * Called on the creation of the surface:+ * setting camera parameters to lower possible resolution+ * (preferred is 640x480)+ * in order to minimize CPU usage+ */+ public void surfaceCreated(SurfaceHolder holder) {/** We bind to the alert service*/- context.bindService(new Intent(context,- MonitorService.class), mConnection, Context.BIND_ABOVE_CLIENT);+ context.bindService(new Intent(context,+ MonitorService.class), mConnection, Context.BIND_ABOVE_CLIENT);/** 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;- }-- if (camera != null) {-- final Camera.Parameters parameters = camera.getParameters();-- try {- List<Size> sizesPreviews = parameters.getSupportedPreviewSizes();-- Size bestSize = sizesPreviews.get(0);-- 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);- }- }-- parameters.setPreviewSize(bestSize.width, bestSize.height);-- } catch (Exception e) {- Log.w("Camera", "Error setting camera preview size", 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);+ 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();++ try {+ List<Size> sizesPreviews = parameters.getSupportedPreviewSizes();++ Size bestSize = sizesPreviews.get(0);++ 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);+ }+ }++ parameters.setPreviewSize(bestSize.width, bestSize.height);++ } catch (Exception e) {+ Log.w("Camera", "Error setting camera preview size", 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 {- parameters.setAutoExposureLock(false);- parameters.setExposureCompensation(parameters.getMaxExposureCompensation());- }- catch (Exception e){}+ parameters.setAutoExposureLock(false);+ parameters.setExposureCompensation(parameters.getMaxExposureCompensation());+ } catch (Exception e) {+ }/** If the flash is needed*/- if (prefs.getFlashActivation()) {- Log.i("Preview", "Flash activated");- parameters.setFlashMode(Parameters.FLASH_MODE_TORCH);- }-- camera.setParameters(parameters);-- try {-- camera.setPreviewDisplay(mHolder);-- camera.setPreviewCallback(new PreviewCallback() {-- public void onPreviewFrame(byte[] data, Camera cam) {-- final Camera.Size size = cam.getParameters().getPreviewSize();- if (size == null) return;- long now = System.currentTimeMillis();- if (now < Preview.this.lastTimestamp + PREVIEW_INTERVAL)- return;- if (!doingProcessing) {--- Log.i("Preview", "Processing new image");- Preview.this.lastTimestamp = now;- MotionAsyncTask task = new MotionAsyncTask(- lastPic,- data,- size.width,- size.height,- updateHandler,- motionSensitivity);- for (MotionAsyncTask.MotionListener listener : listeners) {- Log.i("Preview", "Added listener");- task.addListener(listener);- }- doingProcessing = true;- task.addListener(new MotionAsyncTask.MotionListener() {-- public void onProcess(Bitmap oldBitmap, Bitmap newBitmap,- Bitmap rawBitmap,- boolean motionDetected) {-- if (motionDetected) {- Log.i("MotionListener", "Motion detected");- if (serviceMessenger != null) {- Message message = new Message();- message.what = EventTrigger.CAMERA;--- try {-- File fileImageDir = new File(Environment.getExternalStorageDirectory(), prefs.getImagePath());- fileImageDir.mkdirs();-- String ts = new Date().getTime() + ".jpg";-- File fileImage = new File(fileImageDir, "detected.original." + ts);- FileOutputStream stream = new FileOutputStream(fileImage);- rawBitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);- stream.flush();- stream.close();- message.getData().putString("path", fileImage.getAbsolutePath());-- /**- fileImage = new File(fileImageDir, "detected.match." + ts);- stream = new FileOutputStream(fileImage);- oldBitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);- stream.flush();- stream.close();-- message.getData().putString("path", fileImage.getAbsolutePath());- **/-- serviceMessenger.send(message);-- } catch (Exception e) {- // Cannot happen- Log.e("Preview", "error creating imnage", e);- }- }- }- Log.i("MotionListener", "Allowing further processing");- doingProcessing = false;- }- });- task.start();- lastPic = data;-- try {-- Camera.Parameters parameters = cam.getParameters();- parameters.setExposureCompensation(parameters.getMaxExposureCompensation());- cam.setParameters(parameters);-- }- catch (Exception e){}- }- }- });-- } catch (IOException e) {- e.printStackTrace();- }- }- }-- public void surfaceDestroyed(SurfaceHolder holder) {-- if (camera != null) {- // 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);- camera.setPreviewCallback(null);- camera.stopPreview();- camera.release();- }- }-- public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {- if (camera != null) {+ if (prefs.getFlashActivation()) {+ Log.i("Preview", "Flash activated");+ parameters.setFlashMode(Parameters.FLASH_MODE_TORCH);+ }++ camera.setParameters(parameters);++ try {++ camera.setPreviewDisplay(mHolder);++ camera.setPreviewCallback(new PreviewCallback() {++ public void onPreviewFrame(byte[] data, Camera cam) {++ final Camera.Size size = cam.getParameters().getPreviewSize();+ if (size == null) return;+ long now = System.currentTimeMillis();+ if (now < Preview.this.lastTimestamp + PREVIEW_INTERVAL)+ return;+ if (!doingProcessing) {+++ Log.i("Preview", "Processing new image");+ Preview.this.lastTimestamp = now;+ MotionAsyncTask task = new MotionAsyncTask(+ lastPic,+ data,+ size.width,+ size.height,+ updateHandler,+ motionSensitivity);+ for (MotionAsyncTask.MotionListener listener : listeners) {+ Log.i("Preview", "Added listener");+ task.addListener(listener);+ }+ doingProcessing = true;+ task.addListener(new MotionAsyncTask.MotionListener() {++ public void onProcess(Bitmap oldBitmap, Bitmap newBitmap,+ Bitmap rawBitmap,+ boolean motionDetected) {++ if (motionDetected) {+ Log.i("MotionListener", "Motion detected");+ if (serviceMessenger != null) {+ Message message = new Message();+ message.what = EventTrigger.CAMERA;+++ try {++ File fileImageDir = new File(Environment.getExternalStorageDirectory(), prefs.getImagePath());+ fileImageDir.mkdirs();++ String ts = new Date().getTime() + ".jpg";++ File fileImage = new File(fileImageDir, "detected.original." + ts);+ FileOutputStream stream = new FileOutputStream(fileImage);+ rawBitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);+ stream.flush();+ stream.close();+ message.getData().putString("path", fileImage.getAbsolutePath());+ if (!doingVideoProcessing) {+ record(camera, serviceMessenger);+ }+ /**+ fileImage = new File(fileImageDir, "detected.match." + ts);+ stream = new FileOutputStream(fileImage);+ oldBitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);+ stream.flush();+ stream.close();++ message.getData().putString("path", fileImage.getAbsolutePath());+ **/+ serviceMessenger.send(message);++ } catch (Exception e) {+ // Cannot happen+ Log.e("Preview", "error creating imnage", e);+ }+ }+ }+ Log.i("MotionListener", "Allowing further processing");+ doingProcessing = false;+ }+ });+ task.start();+ lastPic = data;+ try {++ Camera.Parameters parameters = cam.getParameters();+ parameters.setExposureCompensation(parameters.getMaxExposureCompensation());+ cam.setParameters(parameters);++ } catch (Exception e) {+ }+ }+ }+ });++ } catch (IOException e) {+ e.printStackTrace();+ }+ }+ }+ Handler handler = new Handler();+ void record(Camera cam, Messenger messenger) {+ String ts1 = String.valueOf(new Date().getTime());+ String file = Environment.getExternalStorageDirectory() + File.separator + prefs.getImagePath() + File.separator + ts1 + ".mp4";+ MediaRecorderTask mediaRecorderTask = new MediaRecorderTask(cam, file);+ mediaRecorder = mediaRecorderTask.getPreparedMediaRecorder();+ mediaRecorder.start();+ doingVideoProcessing = true;+ handler.postDelayed(() -> {+ if (messenger != null) {+ Message message = new Message();+ message.what = EventTrigger.CAMERA_VIDEO;+ message.getData().putString("path", file);+ try {+ messenger.send(message);+ } catch (RemoteException e) {+ e.printStackTrace();+ }+ mediaRecorder.stop();+ mediaRecorder.reset();+ mediaRecorder.release();+ doingVideoProcessing = false;+ }+ }, 5000);+ }++ public void surfaceDestroyed(SurfaceHolder holder) {++ if (camera != null) {+ // 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);+ camera.setPreviewCallback(null);+ camera.stopPreview();+ camera.release();+ }+ }++ public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {+ if (camera != null) {int degree = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay().getRotation();- int displayOrientation = 0;-- if (prefs.getCamera().equals(PreferenceManager.FRONT)) {-- switch (degree) {- case Surface.ROTATION_0:- displayOrientation = 90;- break;- case Surface.ROTATION_90:- displayOrientation = 0;- break;- case Surface.ROTATION_180:- displayOrientation = 0;- break;- case Surface.ROTATION_270:- displayOrientation = 180;- break;- }- }- else- {+ int displayOrientation = 0;++ if (prefs.getCamera().equals(PreferenceManager.FRONT)) {++ switch (degree) {+ case Surface.ROTATION_0:+ displayOrientation = 90;+ break;+ case Surface.ROTATION_90:+ displayOrientation = 0;+ break;+ case Surface.ROTATION_180:+ displayOrientation = 0;+ break;+ case Surface.ROTATION_270:+ displayOrientation = 180;+ break;+ }+ } else {boolean isLandscape = false;// degree == Configuration.ORIENTATION_LANDSCAPE;- switch (degree) {- case Surface.ROTATION_0:- displayOrientation = isLandscape? 0 : 90;- break;- case Surface.ROTATION_90:- displayOrientation = isLandscape? 0 :270;- break;- case Surface.ROTATION_180:- displayOrientation = isLandscape? 180 :270;- break;- case Surface.ROTATION_270:- displayOrientation = isLandscape? 180 :90;- break;- }- }-- camera.setDisplayOrientation(displayOrientation);-- camera.startPreview();- }- }-- public int getCameraFacing() {- return this.cameraFacing;- }+ switch (degree) {+ case Surface.ROTATION_0:+ displayOrientation = isLandscape ? 0 : 90;+ break;+ case Surface.ROTATION_90:+ displayOrientation = isLandscape ? 0 : 270;+ break;+ case Surface.ROTATION_180:+ displayOrientation = isLandscape ? 180 : 270;+ break;+ case Surface.ROTATION_270:+ displayOrientation = isLandscape ? 180 : 90;+ break;+ }+ }++ camera.setDisplayOrientation(displayOrientation);++ camera.startPreview();+ }+ }++ public int getCameraFacing() {+ return this.cameraFacing;+ }}diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.javaindex f83def5..3a08dc6 100644--- a/src/main/java/org/havenapp/main/service/MonitorService.java+++ b/src/main/java/org/havenapp/main/service/MonitorService.java@@ -224,7 +224,7 @@ public class MonitorService extends Service {mBaroMonitor = new BarometerMonitor(this);mLightMonitor = new AmbientLightMonitor(this);- if (!mPrefs.getMicrophoneSensitivity().equals(PreferenceManager.OFF))+ if (!mPrefs.getMicrophoneSensitivity().equals(PreferenceManager.OFF) && !mPrefs.getVideoMonitoringActive())mMicMonitor = new MicrophoneMonitor(this);@@ -247,7 +247,7 @@ public class MonitorService extends Service {mBaroMonitor.stop(this);mLightMonitor.stop(this);- if (!mPrefs.getMicrophoneSensitivity().equals(PreferenceManager.OFF))+ if (!mPrefs.getMicrophoneSensitivity().equals(PreferenceManager.OFF) && !mPrefs.getVideoMonitoringActive())mMicMonitor.stop(this);}diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xmlindex ea87c96..c41d8d2 100644--- a/src/main/res/values/strings.xml+++ b/src/main/res/values/strings.xml@@ -108,6 +108,7 @@<string name="sensor_sound">Microphone</string><string name="sensor_power">USB Power</string><string name="sensor_bump">Bump (Accelerometer)</string>+ <string name="sensor_camera_video">Motion (Video)</string><string name="sensor_unknown">Unknown</string><string name="settings">Settings</string>@@ -127,5 +128,6 @@<string name="phone_number">Notification Number (Remote)</string><string name="sensors">Sensors</string><string name="label_notifications">Notifications</string>+ <string name="video_active_preference_key">video_active_preference_key</string></resources>diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xmlindex c9d1277..433ca56 100644--- a/src/main/res/xml/settings.xml+++ b/src/main/res/xml/settings.xml@@ -26,6 +26,12 @@</PreferenceCategory><PreferenceCategory android:title="@string/label_notifications">+ <SwitchPreference+ android:defaultValue="false"+ android:key="@string/video_active_preference_key"+ android:summary="Enable Video Monitoring"+ android:title="Video Monitoring" />+<SwitchPreferenceCompatandroid:defaultValue="true"android:key="sms_active"