Merge branch 'media_storage_path_fix' of https://github.com/archie94/…

…haven into archie94-media_storage_path_fix
guardianproject · Apr 17, 2019 · ac94bcb · ac94bcb
2 parents 57153c5 + 3521925
commit ac94bcb
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 8 deletions.
diff --git a/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java
@@ -142,7 +142,7 @@ public void onSensorChanged(SensorEvent event) {
 
                         Message message = new Message();
                         message.what = EventTrigger.ACCELEROMETER;
-                        message.getData().putString("path",mAccel+"");
+                        message.getData().putString(MonitorService.KEY_PATH, mAccel+"");
 
                         try {
                             if (serviceMessenger != null) {

diff --git a/src/main/java/org/havenapp/main/sensors/AmbientLightMonitor.java b/src/main/java/org/havenapp/main/sensors/AmbientLightMonitor.java
@@ -121,7 +121,7 @@ public void onSensorChanged(SensorEvent event) {
 
                         Message message = new Message();
                         message.what = EventTrigger.LIGHT;
-                        message.getData().putString("path",lightChangedValue+"");
+                        message.getData().putString(MonitorService.KEY_PATH, lightChangedValue+"");
 
                         try {
                             if (serviceMessenger != null) {

diff --git a/src/main/java/org/havenapp/main/sensors/BarometerMonitor.java b/src/main/java/org/havenapp/main/sensors/BarometerMonitor.java
@@ -122,7 +122,7 @@ public void onSensorChanged(SensorEvent event) {
 
                         Message message = new Message();
                         message.what = EventTrigger.PRESSURE;
-                        message.getData().putString("path",diffValue+"");
+                        message.getData().putString(MonitorService.KEY_PATH, diffValue+"");
 
                         try {
                             if (serviceMessenger != null) {

diff --git a/src/main/java/org/havenapp/main/sensors/BumpMonitor.java b/src/main/java/org/havenapp/main/sensors/BumpMonitor.java
@@ -83,7 +83,7 @@ public void onTrigger(TriggerEvent event) {
                      */
                     Message message = new Message();
                     message.what = EventTrigger.BUMP;
-                    message.getData().putString("path","BUMPED!");
+                    message.getData().putString(MonitorService.KEY_PATH, "BUMPED!");
 
                     try {
                         if (serviceMessenger != null) {

diff --git a/src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.java b/src/main/java/org/havenapp/main/sensors/MicrophoneMonitor.java
@@ -151,7 +151,7 @@ public void recordingComplete(String path) {
 
                             Message message = new Message();
                             message.what = EventTrigger.MICROPHONE;
-                            message.getData().putString("path",path);
+                            message.getData().putString(MonitorService.KEY_PATH, path);
                             try {
                                 if (serviceMessenger != null)
                                     serviceMessenger.send(message);

diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.java
@@ -241,6 +241,9 @@ private void startSensors ()
     {
         mIsMonitoringActive = true;
 
+        // set current event start date in prefs
+        mPrefs.setCurrentSession(new Date(System.currentTimeMillis()));
+
         if (!mPrefs.getAccelerometerSensitivity().equals(PreferenceManager.OFF)) {
             mAccelManager = new AccelerometerMonitor(this);
             if(Build.VERSION.SDK_INT>=18) {
@@ -328,8 +331,6 @@ public void alert(int alertType, String value) {
                     .getEventDAO().insert(mLastEvent);
             mLastEvent.setId(eventId);
             doNotification = true;
-            // set current event start date in prefs
-            mPrefs.setCurrentSession(mLastEvent.getStartTime());
         }
         else if (mPrefs.getNotificationTimeMs() == 0)
         {

diff --git a/src/main/java/org/havenapp/main/ui/CameraViewHolder.java b/src/main/java/org/havenapp/main/ui/CameraViewHolder.java
@@ -172,7 +172,7 @@ private void saveDetectedImage (Bitmap rawBitmap)
 
                 stream.flush();
                 stream.close();
-                message.getData().putString("path", fileImage.getAbsolutePath());
+                message.getData().putString(MonitorService.KEY_PATH, fileImage.getAbsolutePath());
 
                 //store the still match frame, even if doing video
                 serviceMessenger.send(message);