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
configure video length from settings using time picker dialog.
percy-g2ad3779d3a8f0
diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.javaindex 8c8f6d4..01453b8 100644--- a/src/main/java/org/havenapp/main/PreferenceManager.java+++ b/src/main/java/org/havenapp/main/PreferenceManager.java@@ -64,6 +64,8 @@ public class PreferenceManager {private static final String PHONE_ID="phone_id";private static final String TIMER_DELAY="timer_delay";+ private static final String VIDEO_LENGTH="video_length";+ public static final String CONFIG_VIDEO_LENGTH ="config_video_length";private static final String DIR_PATH = "/secureit";public static final String REMOTE_ACCESS_ACTIVE = "remote_access_active";@@ -291,6 +293,17 @@ public class PreferenceManager {prefsEditor.commit();}+ public int getMonitoringTime ()+ {+ return appSharedPrefs.getInt(VIDEO_LENGTH,5);+ }++ public void setMonitoringTime (int delay)+ {+ prefsEditor.putInt(VIDEO_LENGTH,delay);+ prefsEditor.commit();+ }+public String getDirPath() {return DIR_PATH;}diff --git a/src/main/java/org/havenapp/main/SettingsFragment.java b/src/main/java/org/havenapp/main/SettingsFragment.javaindex e931c9a..e784fdc 100644--- a/src/main/java/org/havenapp/main/SettingsFragment.java+++ b/src/main/java/org/havenapp/main/SettingsFragment.java@@ -123,7 +123,13 @@ public class SettingsFragment extends PreferenceFragmentCompat implements SharedPreference prefConfigTimeDelay = findPreference(PreferenceManager.CONFIG_TIME_DELAY);prefConfigTimeDelay.setOnPreferenceClickListener(preference -> {- showTimeDelayDialog();+ showTimeDelayDialog(PreferenceManager.CONFIG_TIME_DELAY);+ return true;+ });++ Preference prefConfigVideoLength = findPreference(PreferenceManager.CONFIG_VIDEO_LENGTH);+ prefConfigVideoLength.setOnPreferenceClickListener(preference -> {+ showTimeDelayDialog(PreferenceManager.CONFIG_VIDEO_LENGTH);return true;});@@ -328,9 +334,13 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared}}- private void showTimeDelayDialog() {- int totalSecs = preferences.getTimerDelay();-+ private void showTimeDelayDialog(String configVideoLength) {+ int totalSecs;+ if (configVideoLength.equalsIgnoreCase(PreferenceManager.CONFIG_TIME_DELAY)) {+ totalSecs = preferences.getTimerDelay();+ } else {+ totalSecs = preferences.getMonitoringTime();+ }int hours = totalSecs / 3600;int minutes = (totalSecs % 3600) / 60;int seconds = totalSecs % 60;@@ -338,7 +348,11 @@ public class SettingsFragment extends PreferenceFragmentCompat implements SharedTimePickerDialog mTimePickerDialog = TimePickerDialog.newInstance(this, hours, minutes, seconds, true);mTimePickerDialog.enableSeconds(true);- mTimePickerDialog.show(mActivity.getFragmentManager(), "TimePickerDialog");+ if (configVideoLength.equalsIgnoreCase(PreferenceManager.CONFIG_TIME_DELAY)) {+ mTimePickerDialog.show(mActivity.getFragmentManager(), "TimeDelayPickerDialog");+ } else {+ mTimePickerDialog.show(mActivity.getFragmentManager(), "VideoLengthPickerDialog");+ }}private boolean checkValidString(String a) {@@ -406,7 +420,11 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared@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);+ }}}diff --git a/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.java b/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.javaindex f86aebd..e16153e 100644--- a/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.java+++ b/src/main/java/org/havenapp/main/sensors/media/MediaRecorderTask.java@@ -15,10 +15,12 @@ public class MediaRecorderTask {private String mOutputFile;private android.media.MediaRecorder mMediaRecorder;private Camera mCamera;+ private int mSeconds;- public MediaRecorderTask(Camera camera, String fileImageDir) {+ public MediaRecorderTask(Camera camera, String fileImageDir, int seconds) {mCamera = camera;mOutputFile = fileImageDir;+ mSeconds = seconds;if(prepare(mCamera)){Log.d("Done", "Media Recorder prepared");} else {@@ -42,7 +44,7 @@ public class MediaRecorderTask {mMediaRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);mMediaRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AMR_NB);mMediaRecorder.setVideoEncoder(MediaRecorder.VideoEncoder.MPEG_4_SP);- mMediaRecorder.setMaxDuration(5000);+ mMediaRecorder.setMaxDuration(mSeconds);mMediaRecorder.setOutputFile(mOutputFile);try {mMediaRecorder.prepare();diff --git a/src/main/java/org/havenapp/main/sensors/motion/Preview.java b/src/main/java/org/havenapp/main/sensors/motion/Preview.javaindex a324da4..458251e 100644--- a/src/main/java/org/havenapp/main/sensors/motion/Preview.java+++ b/src/main/java/org/havenapp/main/sensors/motion/Preview.java@@ -344,7 +344,8 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {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);+ int seconds = prefs.getMonitoringTime() * 1000;+ MediaRecorderTask mediaRecorderTask = new MediaRecorderTask(cam, file, seconds);mediaRecorder = mediaRecorderTask.getPreparedMediaRecorder();AudioManager audioManager = (AudioManager) context.getApplicationContext().getSystemService(Context.AUDIO_SERVICE);if (audioManager != null) {@@ -372,7 +373,7 @@ public class Preview extends SurfaceView implements SurfaceHolder.Callback {mediaRecorder.release();doingVideoProcessing = false;}- }, 5000);+ }, seconds);}public void surfaceDestroyed(SurfaceHolder holder) {diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xmlindex 433ca56..a2175bd 100644--- a/src/main/res/xml/settings.xml+++ b/src/main/res/xml/settings.xml@@ -5,6 +5,18 @@android:key="config_delay_time"android:title="@string/timer_delay_label" />+ <PreferenceCategory android:title="Video Settings">+ <Preference+ android:key="config_video_length"+ android:title="Set Monitoring Video Length" />++ <SwitchPreference+ android:defaultValue="false"+ android:key="@string/video_active_preference_key"+ android:summary="Enable Video Monitoring"+ android:title="Video Monitoring" />+ </PreferenceCategory>+<PreferenceCategory android:title="@string/sensors"><ListPreference@@ -26,12 +38,6 @@</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"@@ -66,7 +72,7 @@</PreferenceCategory><PreferenceCategory android:title="@string/remote_access">- <SwitchPreferenceCompat+ <SwitchPreferenceCompatandroid:defaultValue="false"android:key="remote_access_active"android:summary="@string/remote_access_label"