Skip to content

armgit / haven

Public Imported from GitHub
0

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

work on #330 to allow configuration of base storage path

n8fr817113152b3cf
diff --git a/src/main/java/org/havenapp/main/MonitorActivity.java b/src/main/java/org/havenapp/main/MonitorActivity.java
index 6f44aa7..84c4cb9 100644
--- a/src/main/java/org/havenapp/main/MonitorActivity.java
+++ b/src/main/java/org/havenapp/main/MonitorActivity.java
@@ -297,7 +297,7 @@ public class MonitorActivity extends AppCompatActivity implements TimePickerDial
//ensure folder exists and will not be scanned by the gallery app
try {
- File fileImageDir = new File(Environment.getExternalStorageDirectory(), preferences.getImagePath());
+ File fileImageDir = new File(Environment.getExternalStorageDirectory(), preferences.getDefaultMediaStoragePath());
fileImageDir.mkdirs();
new FileOutputStream(new File(fileImageDir, ".nomedia")).write(0);
} catch (IOException e) {
diff --git a/src/main/java/org/havenapp/main/PreferenceManager.java b/src/main/java/org/havenapp/main/PreferenceManager.java
index b5b1200..7dbaa90 100644
--- a/src/main/java/org/havenapp/main/PreferenceManager.java
+++ b/src/main/java/org/havenapp/main/PreferenceManager.java
@@ -91,6 +91,9 @@ public class PreferenceManager {
private static final String CURRENT_EVENT_START_TIME = "current_event_start_time";
+ private static final String CONFIG_BASE_STORAGE = "config_base_storage";
+ private static final String CONFIG_BASE_STORAGE_DEFAULT = "/phoneypot";
+
private Context context;
public PreferenceManager(Context context) {
@@ -296,23 +299,13 @@ public class PreferenceManager {
return context.getString(R.string.intrusion_detected);
}
- public String getImagePath ()
- {
- return getDefaultMediaStoragePath();
- }
-
public int getMaxImages ()
{
return 10;
}
- public String getAudioPath ()
- {
- return getDefaultMediaStoragePath();
- }
-
- private String getDefaultMediaStoragePath() {
- return "/phoneypot" + File.separator + getCurrentSession(); //phoneypot is the old code name for Haven
+ public String getDefaultMediaStoragePath() {
+ return appSharedPrefs.getString(CONFIG_BASE_STORAGE,CONFIG_BASE_STORAGE_DEFAULT) + File.separator + getCurrentSession(); //phoneypot is the old code name for Haven
}
public int getAudioLength ()
diff --git a/src/main/java/org/havenapp/main/sensors/media/AudioRecorderTask.java b/src/main/java/org/havenapp/main/sensors/media/AudioRecorderTask.java
index 5012a22..0cba9c4 100644
--- a/src/main/java/org/havenapp/main/sensors/media/AudioRecorderTask.java
+++ b/src/main/java/org/havenapp/main/sensors/media/AudioRecorderTask.java
@@ -67,7 +67,7 @@ public class AudioRecorderTask extends Thread {
this.prefs = new PreferenceManager(context);
Log.i("AudioRecorderTask", "Created recorder");
- File fileFolder = new File(Environment.getExternalStorageDirectory().getPath(),prefs.getAudioPath());
+ File fileFolder = new File(Environment.getExternalStorageDirectory().getPath(),prefs.getDefaultMediaStoragePath());
fileFolder.mkdirs();
audioPath = new File(fileFolder,new java.util.Date().getTime() + ".m4a");
diff --git a/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java b/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java
index c9d24b4..cfafcf5 100644
--- a/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java
+++ b/src/main/java/org/havenapp/main/sensors/motion/CameraViewHolder.java
@@ -142,7 +142,7 @@ public class CameraViewHolder {
try {
- File fileImageDir = new File(Environment.getExternalStorageDirectory(), prefs.getImagePath());
+ File fileImageDir = new File(Environment.getExternalStorageDirectory(), prefs.getDefaultMediaStoragePath());
fileImageDir.mkdirs();
String ts = new Date().getTime() + ".jpg";
@@ -330,7 +330,7 @@ public class CameraViewHolder {
if (doingVideoProcessing)
return false;
String ts1 = String.valueOf(new Date().getTime());
- videoFile = Environment.getExternalStorageDirectory() + File.separator + prefs.getImagePath() + File.separator + ts1 + ".mp4";
+ videoFile = Environment.getExternalStorageDirectory() + File.separator + prefs.getDefaultMediaStoragePath() + File.separator + ts1 + ".mp4";
try {
encoder = AndroidSequenceEncoder.createSequenceEncoder(new File(videoFile),5);
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f0e0c5b..6d3d24e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -156,5 +156,7 @@
<string name="heartbeat_time_dialog">Enter interval time (minutes) to receive notifications:\n\nMinimum of 1, default is 5.</string>
<string name="hearbeat_monitor_dialog">Set alert delay for the status notifications </string>
<string name="title_activity_video_player">VideoPlayerActivity</string>
+ <string name="config_storage_path">Storage Folder Path</string>
+ <string name="config_storage_page_hint">Where captured media is stored</string>
</resources>
diff --git a/src/main/res/xml/settings.xml b/src/main/res/xml/settings.xml
index c690a81..0da05e0 100644
--- a/src/main/res/xml/settings.xml
+++ b/src/main/res/xml/settings.xml
@@ -5,6 +5,14 @@
android:key="config_delay_time"
android:title="@string/timer_delay_label" />
+ <EditTextPreference
+ android:dialogLayout="@layout/pref_dialog_edit_text"
+ android:dialogMessage="@string/remote_access_hint"
+ android:key="config_base_storage"
+ android:summary="@string/config_storage_page_hint"
+ android:title="@string/config_storage_path"
+ android:defaultValue="/phoneypot"
+ />
<Preference
android:key="config_battery_optimizations"