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
add Barometer/Pressure sensor #32 first bits of code - need to figure out what a typical "diff" in pressure looks like when a door opens
n8fr869c47ba3002f
diff --git a/src/main/java/info/guardianproject/phoneypot/ListActivity.java b/src/main/java/info/guardianproject/phoneypot/ListActivity.javaindex a41e5dc..0fff457 100644--- a/src/main/java/info/guardianproject/phoneypot/ListActivity.java+++ b/src/main/java/info/guardianproject/phoneypot/ListActivity.java@@ -66,70 +66,70 @@ public class ListActivity extends AppCompatActivity {modifyPos = savedInstanceState.getInt("modify");- if (initialCount > 0) {+ if (initialCount == 0) {- events = Event.listAll(Event.class);-- adapter = new EventAdapter(ListActivity.this, events);- recyclerView.setAdapter(adapter);-- // Handling swipe to delete- ItemTouchHelper.SimpleCallback simpleCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {-- @Override- public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {- return false;- }-- @Override- public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {- //Remove swiped item from list and notify the RecyclerView+ showOnboarding();- final int position = viewHolder.getAdapterPosition();- final Event event = events.get(viewHolder.getAdapterPosition());- events.remove(viewHolder.getAdapterPosition());- adapter.notifyItemRemoved(position);+ }- event.delete();- initialCount -= 1;+ events = Event.listAll(Event.class);- Snackbar.make(recyclerView, "Event deleted", Snackbar.LENGTH_SHORT)- .setAction("UNDO", new View.OnClickListener() {- @Override- public void onClick(View v) {+ adapter = new EventAdapter(ListActivity.this, events);+ recyclerView.setAdapter(adapter);- event.save();- events.add(position, event);- adapter.notifyItemInserted(position);- initialCount += 1;+ // Handling swipe to delete+ ItemTouchHelper.SimpleCallback simpleCallback = new ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT | ItemTouchHelper.RIGHT) {- }- })- .show();- }+ @Override+ public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {+ return false;+ }- };+ @Override+ public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {+ //Remove swiped item from list and notify the RecyclerView++ final int position = viewHolder.getAdapterPosition();+ final Event event = events.get(viewHolder.getAdapterPosition());+ events.remove(viewHolder.getAdapterPosition());+ adapter.notifyItemRemoved(position);++ event.delete();+ initialCount -= 1;++ Snackbar.make(recyclerView, "Event deleted", Snackbar.LENGTH_SHORT)+ .setAction("UNDO", new View.OnClickListener() {+ @Override+ public void onClick(View v) {++ event.save();+ events.add(position, event);+ adapter.notifyItemInserted(position);+ initialCount += 1;++ }+ })+ .show();+ }- ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleCallback);- itemTouchHelper.attachToRecyclerView(recyclerView);+ };+ ItemTouchHelper itemTouchHelper = new ItemTouchHelper(simpleCallback);+ itemTouchHelper.attachToRecyclerView(recyclerView);- adapter.SetOnItemClickListener(new EventAdapter.OnItemClickListener() {- @Override- public void onItemClick(View view, int position) {- Intent i = new Intent(ListActivity.this, EventActivity.class);- i.putExtra("eventid", events.get(position).getId());- modifyPos = position;+ adapter.SetOnItemClickListener(new EventAdapter.OnItemClickListener() {+ @Override+ public void onItemClick(View view, int position) {- startActivity(i);- }- });+ Intent i = new Intent(ListActivity.this, EventActivity.class);+ i.putExtra("eventid", events.get(position).getId());+ modifyPos = position;+ startActivity(i);+ }+ });- } else {- showOnboarding();- }if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {diff --git a/src/main/java/info/guardianproject/phoneypot/model/EventTrigger.java b/src/main/java/info/guardianproject/phoneypot/model/EventTrigger.javaindex 59677c3..000d88c 100644--- a/src/main/java/info/guardianproject/phoneypot/model/EventTrigger.java+++ b/src/main/java/info/guardianproject/phoneypot/model/EventTrigger.java@@ -31,6 +31,11 @@ public class EventTrigger extends SugarRecord {*/public static final int MICROPHONE = 2;+ /**+ * Pressure change detected message+ */+ public static final int PRESSURE = 2;+public EventTrigger (){diff --git a/src/main/java/info/guardianproject/phoneypot/service/AccelerometerMonitor.java b/src/main/java/info/guardianproject/phoneypot/sensors/AccelerometerMonitor.javasimilarity index 96%rename from src/main/java/info/guardianproject/phoneypot/service/AccelerometerMonitor.javarename to src/main/java/info/guardianproject/phoneypot/sensors/AccelerometerMonitor.javaindex ebd2891..6176847 100644--- a/src/main/java/info/guardianproject/phoneypot/service/AccelerometerMonitor.java+++ b/src/main/java/info/guardianproject/phoneypot/sensors/AccelerometerMonitor.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.service;+package info.guardianproject.phoneypot.sensors;import android.app.Activity;import android.content.ComponentName;@@ -17,6 +17,7 @@ import android.util.Log;import info.guardianproject.phoneypot.PreferenceManager;import info.guardianproject.phoneypot.model.EventTrigger;+import info.guardianproject.phoneypot.service.MonitorService;/*** Created by n8fr8 on 3/10/17.@@ -133,6 +134,7 @@ public class AccelerometerMonitor implements SensorEventListener {Message message = new Message();message.what = EventTrigger.ACCELEROMETER;+ message.getData().putString("path",speed+"");try {if (serviceMessenger != null) {diff --git a/src/main/java/info/guardianproject/phoneypot/sensors/BarometerMonitor.java b/src/main/java/info/guardianproject/phoneypot/sensors/BarometerMonitor.javanew file mode 100644index 0000000..b2086a8--- /dev/null+++ b/src/main/java/info/guardianproject/phoneypot/sensors/BarometerMonitor.java@@ -0,0 +1,163 @@+package info.guardianproject.phoneypot.sensors;++import android.app.Activity;+import android.content.ComponentName;+import android.content.Context;+import android.content.Intent;+import android.content.ServiceConnection;+import android.hardware.Sensor;+import android.hardware.SensorEvent;+import android.hardware.SensorEventListener;+import android.hardware.SensorManager;+import android.os.IBinder;+import android.os.Message;+import android.os.Messenger;+import android.os.RemoteException;+import android.util.Log;++import info.guardianproject.phoneypot.PreferenceManager;+import info.guardianproject.phoneypot.model.EventTrigger;+import info.guardianproject.phoneypot.service.MonitorService;++/**+ * Created by n8fr8 on 3/10/17.+ */+public class BarometerMonitor implements SensorEventListener {++ // For shake motion detection.+ private SensorManager sensorMgr;++ /**+ * Barometer sensor+ */+ private Sensor sensor;++ /**+ * Last update of the accelerometer+ */+ private long lastUpdate = -1;++ /**+ * Current accelerometer values+ */+ private float accel_values[];++ /**+ * Last accelerometer values+ */+ private float last_accel_values[];++ /**+ * Data field used to retrieve application prefences+ */+ private PreferenceManager prefs;+++ /**+ * Text showing accelerometer values+ */+ private int maxAlertPeriod = 30;+ private int remainingAlertPeriod = 0;+ private boolean alert = false;+ private final static int CHECK_INTERVAL = 1000;++ private int CHANGE_THRESHOLD = 200; //hPa or mbar++ public BarometerMonitor(Context context) {+ prefs = new PreferenceManager(context);++++ context.bindService(new Intent(context,+ MonitorService.class), mConnection, Context.BIND_ABOVE_CLIENT);++ sensorMgr = (SensorManager) context.getSystemService(Activity.SENSOR_SERVICE);+ sensor = (Sensor) sensorMgr.getDefaultSensor(Sensor.TYPE_PRESSURE);++ if (sensor == null) {+ Log.i("Pressure", "Warning: no barometer sensor");+ } else {+ sensorMgr.registerListener(this, sensor, SensorManager.SENSOR_DELAY_NORMAL);+ }++ }++ public void onAccuracyChanged(Sensor sensor, int accuracy) {+ // Safe not to implement++ }++ public void onSensorChanged(SensorEvent event) {+ long curTime = System.currentTimeMillis();++ // only allow one update every 100ms.+ if (event.sensor.getType() == Sensor.TYPE_PRESSURE) {++ if ((curTime - lastUpdate) > CHECK_INTERVAL) {+ long diffTime = (curTime - lastUpdate);+ lastUpdate = curTime;++ accel_values = event.values.clone();++ if (alert && remainingAlertPeriod > 0) {+ remainingAlertPeriod = remainingAlertPeriod - 1;+ } else {+ alert = false;+ }++ if (last_accel_values != null) {++ float diffValue = accel_values[0] - last_accel_values[0];++ boolean logit = (diffValue > CHANGE_THRESHOLD);++ if (logit) {+ /*+ * Send Alert+ */++ alert = true;+ remainingAlertPeriod = maxAlertPeriod;++ Message message = new Message();+ message.what = EventTrigger.PRESSURE;+ message.getData().putString("path",diffValue+"");++ try {+ if (serviceMessenger != null) {+ serviceMessenger.send(message);+ }+ } catch (RemoteException e) {+ // TODO Auto-generated catch block+ e.printStackTrace();+ }+ }+ }+ last_accel_values = accel_values.clone();+ }+ }+ }++ public void stop(Context context) {+ sensorMgr.unregisterListener(this);+ context.unbindService(mConnection);+ }++ private Messenger serviceMessenger = null;++ private ServiceConnection mConnection = new ServiceConnection() {++ public void onServiceConnected(ComponentName className,+ IBinder service) {+ Log.i("AccelerometerFragment", "SERVICE CONNECTED");+ // We've bound to LocalService, cast the IBinder and get LocalService instance+ serviceMessenger = new Messenger(service);+ }++ public void onServiceDisconnected(ComponentName arg0) {+ Log.i("AccelerometerFragment", "SERVICE DISCONNECTED");+ serviceMessenger = null;+ }+ };++}diff --git a/src/main/java/info/guardianproject/phoneypot/service/MicrophoneMonitor.java b/src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.javasimilarity index 97%rename from src/main/java/info/guardianproject/phoneypot/service/MicrophoneMonitor.javarename to src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.javaindex d685e1a..ae61bf5 100644--- a/src/main/java/info/guardianproject/phoneypot/service/MicrophoneMonitor.java+++ b/src/main/java/info/guardianproject/phoneypot/sensors/MicrophoneMonitor.java@@ -1,4 +1,4 @@-package info.guardianproject.phoneypot.service;+package info.guardianproject.phoneypot.sensors;/*** Created by n8fr8 on 3/10/17.@@ -19,6 +19,7 @@ import info.guardianproject.phoneypot.model.EventTrigger;import info.guardianproject.phoneypot.sensors.media.AudioRecorderTask;import info.guardianproject.phoneypot.sensors.media.MicSamplerTask;import info.guardianproject.phoneypot.sensors.media.MicrophoneTaskFactory;+import info.guardianproject.phoneypot.service.MonitorService;public final class MicrophoneMonitor implements MicSamplerTask.MicListener {diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.javaindex addad6a..6ac1917 100644--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java+++ b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java@@ -30,6 +30,9 @@ import info.guardianproject.phoneypot.R;import info.guardianproject.phoneypot.PreferenceManager;import info.guardianproject.phoneypot.model.Event;import info.guardianproject.phoneypot.model.EventTrigger;+import info.guardianproject.phoneypot.sensors.AccelerometerMonitor;+import info.guardianproject.phoneypot.sensors.BarometerMonitor;+import info.guardianproject.phoneypot.sensors.MicrophoneMonitor;@SuppressLint("HandlerLeak")public class MonitorService extends Service {@@ -60,6 +63,7 @@ public class MonitorService extends Service {*/AccelerometerMonitor mAccelManager = null;MicrophoneMonitor mMicMonitor = null;+ BarometerMonitor mBaroMonitor = null;/*** Last Event instances@@ -167,8 +171,10 @@ public class MonitorService extends Service {private void startSensors (){- if (prefs.getAccelerometerSensitivity() != PreferenceManager.OFF)+ if (prefs.getAccelerometerSensitivity() != PreferenceManager.OFF) {mAccelManager = new AccelerometerMonitor(this);+ mBaroMonitor = new BarometerMonitor(this);+ }if (prefs.getMicrophoneSensitivity() != PreferenceManager.OFF)mMicMonitor = new MicrophoneMonitor(this);@@ -178,8 +184,10 @@ public class MonitorService extends Service {private void stopSensors (){- if (prefs.getAccelerometerSensitivity() != PreferenceManager.OFF)+ if (prefs.getAccelerometerSensitivity() != PreferenceManager.OFF) {mAccelManager.stop(this);+ mBaroMonitor.stop(this);+ }if (prefs.getMicrophoneSensitivity() != PreferenceManager.OFF)mMicMonitor.stop(this);diff --git a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.javaindex 20734a8..67b828b 100644--- a/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java+++ b/src/main/java/info/guardianproject/phoneypot/ui/EventTriggerAdapter.java@@ -52,12 +52,10 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapteString title = eventTrigger.getStringType();String desc = eventTrigger.getTriggerTime().toString();- holder.title.setText(title);- holder.note.setText(desc);-holder.image.setVisibility(View.GONE);holder.extra.setVisibility(View.GONE);+if (eventTrigger.getPath() != null){if (eventTrigger.getType() == EventTrigger.CAMERA)@@ -76,9 +74,22 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapte.useDefaultUi(holder.extra, inflater);}+ else if (eventTrigger.getType() == EventTrigger.ACCELEROMETER)+ {+ desc += "\nSPEED: " + eventTrigger.getPath();+ }+ else if (eventTrigger.getType() == EventTrigger.PRESSURE)+ {+ desc += "\nCHANGE IN PRESSURE: " + eventTrigger.getPath();+ }}+ holder.title.setText(title);+ holder.note.setText(desc);+++}