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
fix issues with persistence of event triggers
n8fr8a2ba0587b449
diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.javaindex 6a79cc0..084bf2c 100644--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java+++ b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java@@ -201,30 +201,23 @@ public class MonitorService extends Service {Date now = new Date();boolean isNewEvent = false;- if (mLastEvent == null)+ if (mLastEvent == null || (!mLastEvent.insideEventWindow(now))){mLastEvent = new Event();- isNewEvent = true;- mLastEvent.save();- }- else if (!mLastEvent.insideEventWindow(now))- {- //save the current eventmLastEvent.save();- //now create a new one- mLastEvent = new Event();isNewEvent = true;- mLastEvent.save();}EventTrigger eventTrigger = new EventTrigger();eventTrigger.setType(alertType);eventTrigger.setPath(path);- eventTrigger.save();mLastEvent.addEventTrigger(eventTrigger);+ //we don't need to resave the event, only the trigger+ eventTrigger.save();+/** If SMS mode is on we send an SMS alert to the specified* number@@ -233,7 +226,7 @@ public class MonitorService extends Service {//get the managerStringBuffer alertMessage = new StringBuffer();- alertMessage.append(getString(R.string.intrusion_detected));+ alertMessage.append(getString(R.string.intrusion_detected,eventTrigger.getStringType()));SmsManager manager = SmsManager.getDefault();manager.sendTextMessage(prefs.getSmsNumber(), null, alertMessage.toString(), null, null);diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xmlindex 1e67d99..c665279 100644--- a/src/main/res/values/strings.xml+++ b/src/main/res/values/strings.xml@@ -73,7 +73,7 @@<string name="secure_service_stopped">Phoneypot Deactivated</string>- <string name="intrusion_detected">An intrusion was detected. Capturing audio and photo evidence now.</string>+ <string name="intrusion_detected">An intrusion was detected (Type: $1%s). Capturing audio and photo evidence now.</string><string name="title_activity_event">EventActivity</string><string name="action_settings">Settings</string>