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-g2c140f5ae61f0
diff --cc src/main/java/org/havenapp/main/SettingsFragment.javaindex e784fdc,1846d5b..90f9dc9--- a/src/main/java/org/havenapp/main/SettingsFragment.java+++ b/src/main/java/org/havenapp/main/SettingsFragment.java@@@ -9,10 -10,13 +10,14 @@@ import android.content.Contextimport android.content.Intent;import android.content.SharedPreferences;import android.content.pm.PackageManager;+ import android.net.Uri;+ import android.os.Build;import android.os.Bundle;import android.os.Environment;+ import android.os.PowerManager;+ import android.provider.Settings;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;@@@ -420,11 -439,23 +458,27 @@@ public class SettingsFragment extends P@Overridepublic void onTimeSet(TimePickerDialog view, int hourOfDay, int minute, int second) {- int delaySeconds = second + minute * 60 + hourOfDay * 60 * 60;- preferences.setTimerDelay(delaySeconds);+ int Seconds = second + minute * 60 + hourOfDay * 60 * 60;+ if (view.getTag().equalsIgnoreCase("TimeDelayPickerDialog")) {+ preferences.setTimerDelay(Seconds);+ } else if (view.getTag().equalsIgnoreCase("VideoLengthPickerDialog")) {+ preferences.setMonitoringTime(Seconds);+ }}++ private void requestChangeBatteryOptimizations ()+ {+ if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {+ Intent intent = new Intent();+ String packageName = getActivity().getPackageName();+ PowerManager pm = (PowerManager) getActivity().getSystemService(Context.POWER_SERVICE);+ if (pm.isIgnoringBatteryOptimizations(packageName))+ intent.setAction(Settings.ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS);+ else {+ intent.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);+ intent.setData(Uri.parse("package:" + packageName));+ }+ getActivity().startActivity(intent);+ }+ }}diff --cc src/main/java/org/havenapp/main/sensors/motion/Preview.javaindex 6348004,524ccb6..415049b--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java@@@ -34,7 -31,7 +34,8 @@@ import android.view.WindowManagerimport org.havenapp.main.PreferenceManager;import org.havenapp.main.model.EventTrigger;+ import org.havenapp.main.sensors.media.ImageCodec;+import org.havenapp.main.sensors.media.MediaRecorderTask;import org.havenapp.main.sensors.media.MotionAsyncTask;import org.havenapp.main.service.MonitorService;@@@ -106,51 -103,40 +107,43 @@@ public class Preview extends SurfaceVie};- private SurfaceHolder mHolder;- private Camera camera;- private Context context;+ private SurfaceHolder mHolder;+ private Camera camera;+ private Context context;+ private MotionAsyncTask task;+ private String videoFile;- 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- */- 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);- }-+ 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);+- motionSensitivity = prefs.getCameraSensitivity();- }++ motionSensitivity =prefs.getCameraSensitivity();++ }+- public void setMotionSensitivity (int motionSensitivity)- {- this.motionSensitivity = motionSensitivity;++ public void setMotionSensitivity (int++ motionSensitivity )++ {++ this.++ motionSensitivity = motionSensitivity;+ }++ 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) {+ /**+ * 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@@@ -235,219 -222,181 +228,223 @@@/** If the flash is needed*/- if (prefs.getFlashActivation()) {- Log.i("Preview", "Flash activated");- parameters.setFlashMode(Parameters.FLASH_MODE_TORCH);- }+ if (prefs.getFlashActivation()) {+ Log.i("Preview", "Flash activated");+ parameters.setFlashMode(Parameters.FLASH_MODE_TORCH);+ }- camera.setParameters(parameters);+ camera.setParameters(parameters);- try {+ try {- camera.setPreviewDisplay(mHolder);+ camera.setPreviewDisplay(mHolder);- camera.setPreviewCallback(new PreviewCallback() {+ camera.setPreviewCallback(new PreviewCallback() {- public void onPreviewFrame(byte[] data, Camera cam) {+ 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) {+ 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() {+ Log.i("Preview", "Processing new image");+ Preview.this.lastTimestamp = now;- task = new 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) {+ 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;+ if (motionDetected) {+ Log.i("MotionListener", "Motion detected");+ if (serviceMessenger != null) {+ Message message = new Message();+ message.what = EventTrigger.CAMERA;- try {+ try {- File fileImageDir = new File(Environment.getExternalStorageDirectory(), prefs.getImagePath());- fileImageDir.mkdirs();+ File fileImageDir = new File(Environment.getExternalStorageDirectory(), prefs.getImagePath());+ fileImageDir.mkdirs();- String ts = new Date().getTime() + ".jpg";+ 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 && prefs.getVideoMonitoringActive()) {+ File fileImage = new File(fileImageDir, "detected.original." + ts);+ FileOutputStream stream = new FileOutputStream(fileImage);+ if (prefs.getCamera().equalsIgnoreCase(PreferenceManager.BACK)) {+ Bitmap bmps = ImageCodec.rotate(rawBitmap, 180, false);- bmps.compress(Bitmap.CompressFormat.JPEG, 100, stream);- } else {++ bmps.compress(Bitmap.CompressFormat.JPEG, 100, stream);} else {+ rawBitmap.compress(Bitmap.CompressFormat.JPEG, 100, stream);+ }+ stream.flush();+ stream.close();+ message.getData().putString("path", fileImage.getAbsolutePath());-++if (!doingVideoProcessing && prefs.getVideoMonitoringActive()) {+ 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();+ /**+ 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){}- }- }- });+ 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());+ videoFile = Environment.getExternalStorageDirectory() + File.separator + prefs.getImagePath() + File.separator + ts1 + ".mp4";+ int seconds = prefs.getMonitoringTime() * 1000;+ MediaRecorderTask mediaRecorderTask = new MediaRecorderTask(cam, videoFile, seconds);+ mediaRecorder = mediaRecorderTask.getPreparedMediaRecorder();+ AudioManager audioManager = (AudioManager) context.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);+ if (audioManager != null) {+ audioManager.setStreamMute(AudioManager.STREAM_SYSTEM, true);+ audioManager.setStreamMute(AudioManager.STREAM_MUSIC,true);+ }+ mediaRecorder.start();+ doingVideoProcessing = true;+ handler.postDelayed(() -> {+ if (messenger != null) {+ Message message = new Message();+ message.what = EventTrigger.CAMERA_VIDEO;+ message.getData().putString("path", videoFile);+ try {+ messenger.send(message);+ } catch (RemoteException e) {+ e.printStackTrace();+ }+ if (audioManager != null) {+ audioManager.setStreamMute(AudioManager.STREAM_SYSTEM, false);+ audioManager.setStreamMute(AudioManager.STREAM_MUSIC, false);+ }+ mediaRecorder.stop();+ mediaRecorder.reset();+ mediaRecorder.release();+ doingVideoProcessing = false;+ }+ }, seconds);+ }- } catch (IOException e) {- e.printStackTrace();- }- }- }+ public void surfaceDestroyed(SurfaceHolder holder) {- 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();- }- }+ if (doingVideoProcessing && serviceMessenger != null && prefs.getVideoMonitoringActive()) {+ Message message = new Message();+ message.what = EventTrigger.CAMERA_VIDEO;+ message.getData().putString("path", videoFile);+ try {+ serviceMessenger.send(message);+ } catch (RemoteException e) {+ e.printStackTrace();+ }+ }+ 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) {+ 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;- }- }+ 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.setDisplayOrientation(displayOrientation);- camera.startPreview();- }- }-- public int getCameraFacing() {- return this.cameraFacing;- }+ camera.startPreview();+ }+ }++ public int getCameraFacing() {+ return this.cameraFacing;+ }}diff --cc src/main/res/values/strings.xmlindex b95aba8,ed64218..a6c2afc--- a/src/main/res/values/strings.xml+++ b/src/main/res/values/strings.xml@@@ -128,9 -127,17 +128,21 @@@<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>+ <string name="config_video_length_label">Set Video Monitoring Length</string>+ <string name="video_monitoring">Video Monitoring</string>+ <string name="video_settings">Video Settings</string>+ <string name="camera_sensitivity">Camera Sensitivity</string>++ <string name="notification_time">Notification Time Interval</string>+ <string name="notification_time_summary">Only send notifications at configured interval</string>+ <string name="notification_time_dialog">Enter time (minutes) to limit notifications. \'0\' to send every notification.</string>+ <string name="minutes">minutes(s)</string>+ <string name="keep_watch">Keep Watch!</string>+ <string name="camera_sensitivity_tip">Select camera and use the slider to adjust motion detection sensitivity</string>+ <string name="disable_battery_opt_title">Disable Battery Optimizations</string>+ <string name="disable_battery_opt_summary">Allow app to run when screen is off</string>++</resources>diff --cc src/main/res/xml/settings.xmlindex dc651a4,406fc4d..af49364--- a/src/main/res/xml/settings.xml+++ b/src/main/res/xml/settings.xml@@@ -5,17 -5,12 +5,23 @@@android:key="config_delay_time"android:title="@string/timer_delay_label" />++ <Preference+ android:key="config_battery_optimizations"+ android:title="@string/disable_battery_opt_title"+ android:summary="@string/disable_battery_opt_summary"/>++ <PreferenceCategory android:title="@string/video_settings">+ <Preference+ android:key="config_video_length"+ android:title="@string/config_video_length_label" />++ <SwitchPreference+ android:defaultValue="false"+ android:key="@string/video_active_preference_key"+ android:title="@string/video_monitoring" />+ </PreferenceCategory>+<PreferenceCategory android:title="@string/sensors"><ListPreference