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

Use String Constant in MonitorService instead of hardcoded value

Arka Prava Basu35219253eb4a
diff --git a/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java
index 74ccba0..990e549 100644
--- 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 class AccelerometerMonitor implements SensorEventListener {
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
index c521361..037df99 100644
--- 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 class AmbientLightMonitor implements SensorEventListener {
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
index 1c5f5bc..fc297a6 100644
--- 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 class BarometerMonitor implements SensorEventListener {
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
index 0d321e5..5050b8e 100644
--- 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 class BumpMonitor {
*/
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
index 53d74d7..925bf82 100644
--- 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 final class MicrophoneMonitor implements MicSamplerTask.MicListener {
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/ui/CameraViewHolder.java b/src/main/java/org/havenapp/main/ui/CameraViewHolder.java
index 1fb79c7..710dd05 100644
--- a/src/main/java/org/havenapp/main/ui/CameraViewHolder.java
+++ b/src/main/java/org/havenapp/main/ui/CameraViewHolder.java
@@ -172,7 +172,7 @@ public class CameraViewHolder {
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);