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

using Sugar ORM for data persistence of event info

n8fr87332fec344e8
diff --git a/build.gradle b/build.gradle
index eb66682..c234b39 100644
--- a/build.gradle
+++ b/build.gradle
@@ -47,4 +47,6 @@ android {
dependencies {
compile 'com.android.support:support-v4:25.0.0'
+ compile 'com.github.satyan:sugar:1.5'
+
}
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index 4375ca7..6e8c83f 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -19,7 +19,9 @@
<application
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
- android:theme="@style/AppTheme" >
+ android:theme="@style/AppTheme"
+ android:name="com.orm.SugarApp"
+ >
<activity
android:name=".StartActivity"
android:label="@string/title_activity_start"
@@ -36,5 +38,11 @@
android:launchMode="singleTop"
android:screenOrientation="portrait"/>
<service android:name=".service.MonitorService"/>
+
+ <meta-data android:name="DATABASE" android:value="phoneypot.db" />
+ <meta-data android:name="VERSION" android:value="1" />
+ <meta-data android:name="QUERY_LOG" android:value="true" />
+ <meta-data android:name="DOMAIN_PACKAGE_NAME" android:value="info.guardianproject.phoneypot.model" />
+
</application>
</manifest>
diff --git a/src/main/java/info/guardianproject/phoneypot/model/Event.java b/src/main/java/info/guardianproject/phoneypot/model/Event.java
new file mode 100644
index 0000000..a4cd638
--- /dev/null
+++ b/src/main/java/info/guardianproject/phoneypot/model/Event.java
@@ -0,0 +1,41 @@
+package info.guardianproject.phoneypot.model;
+
+import com.orm.SugarRecord;
+
+import java.util.ArrayList;
+import java.util.Date;
+
+/**
+ * Created by n8fr8 on 4/16/17.
+ */
+
+public class Event extends SugarRecord {
+
+ private Date mStartTime;
+
+ private ArrayList<EventTrigger> mEventTriggers;
+
+ public final static long EVENT_WINDOW_TIME = 1000 * 60; //1 minutes
+
+ public Event ()
+ {
+ mStartTime = new Date();
+ mEventTriggers = new ArrayList<>();
+ }
+
+ public void addEventTrigger (EventTrigger eventTrigger)
+ {
+ mEventTriggers.add(eventTrigger);
+ }
+
+ /**
+ * Are we within the time window of this event, or should we start a new event?
+ */
+ public boolean insideEventWindow (Date now)
+ {
+ if (mEventTriggers.size() == 0)
+ return now.getTime() - mStartTime.getTime() <= EVENT_WINDOW_TIME;
+ else
+ return now.getTime() <= mEventTriggers.get(mEventTriggers.size()-1).getTriggerTime().getTime();
+ }
+}
diff --git a/src/main/java/info/guardianproject/phoneypot/model/EventTrigger.java b/src/main/java/info/guardianproject/phoneypot/model/EventTrigger.java
new file mode 100644
index 0000000..b11e14f
--- /dev/null
+++ b/src/main/java/info/guardianproject/phoneypot/model/EventTrigger.java
@@ -0,0 +1,35 @@
+package info.guardianproject.phoneypot.model;
+
+import com.orm.SugarRecord;
+
+import java.util.Date;
+
+/**
+ * Created by n8fr8 on 4/16/17.
+ */
+
+public class EventTrigger extends SugarRecord {
+
+ public enum TriggerType {
+ CAMERA, SOUND, ACCEL
+ }
+
+ public TriggerType mType;
+ public Date mTime;
+
+ public EventTrigger (TriggerType type)
+ {
+ mTime = new Date();
+ mType = type;
+ }
+
+ public TriggerType getType ()
+ {
+ return mType;
+ }
+
+ public Date getTriggerTime ()
+ {
+ return mTime;
+ }
+}
diff --git a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
index dc1b558..d600469 100644
--- a/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
+++ b/src/main/java/info/guardianproject/phoneypot/service/MonitorService.java
@@ -28,6 +28,8 @@ import java.util.Date;
import info.guardianproject.phoneypot.MonitorActivity;
import info.guardianproject.phoneypot.R;
import info.guardianproject.phoneypot.PreferenceManager;
+import info.guardianproject.phoneypot.model.Event;
+import info.guardianproject.phoneypot.model.EventTrigger;
@SuppressLint("HandlerLeak")
public class MonitorService extends Service {
@@ -74,7 +76,12 @@ public class MonitorService extends Service {
AccelerometerMonitor mAccelManager = null;
MicrophoneMonitor mMicMonitor = null;
- /**
+ /**
+ * Last Event instances
+ */
+ Event mLastEvent;
+
+ /**
* Handler for incoming messages
*/
class MessageHandler extends Handler {
@@ -186,78 +193,61 @@ public class MonitorService extends Service {
mMicMonitor.stop(this);
}
- private int mLastAlert = -1;
-
/**
* Sends an alert according to type of connectivity
*/
private synchronized void alert(int alertType) {
- if (alertType == mLastAlert)
- return;
+ Date now = new Date();
+ boolean isNewEvent = false;
- StringBuffer alertMessage = new StringBuffer();
+ if (mLastEvent == null)
+ {
+ mLastEvent = new Event();
+ isNewEvent = true;
+ }
+ else if (!mLastEvent.insideEventWindow(now))
+ {
+ //save the current event
+ mLastEvent.save();
- alertMessage.append(getString(R.string.intrusion_detected));
+ //now create a new one
+ mLastEvent = new Event();
+ isNewEvent = true;
+ }
- switch (alertType)
- {
+ EventTrigger eventTrigger = null;
+ switch (alertType) {
case MonitorService.ACCELEROMETER_MESSAGE:
- alertMessage.append(": Device was moved!");
+ eventTrigger = new EventTrigger(EventTrigger.TriggerType.ACCEL);
break;
case MonitorService.MICROPHONE_MESSAGE:
- alertMessage.append(": Noise detected!");
+ eventTrigger = new EventTrigger(EventTrigger.TriggerType.SOUND);
break;
case MonitorService.CAMERA_MESSAGE:
- alertMessage.append(": Camera motion detected!");
+ eventTrigger = new EventTrigger(EventTrigger.TriggerType.CAMERA);
break;
}
- alertMessage.append(" @ " + new Date().toLocaleString());
-
- /*
- * If SMS mode is on we send an SMS alert to the specified
- * number
- */
- if (prefs.getSmsActivation()) {
- //get the manager
- SmsManager manager = SmsManager.getDefault();
- manager.sendTextMessage(prefs.getSmsNumber(), null, alertMessage.toString(), null, null);
-
- }
+ mLastEvent.addEventTrigger(eventTrigger);
+ /*
+ * If SMS mode is on we send an SMS alert to the specified
+ * number
+ */
+ if (isNewEvent && prefs.getSmsActivation()) {
+ //get the manager
+ StringBuffer alertMessage = new StringBuffer();
+ alertMessage.append(getString(R.string.intrusion_detected));
- mLastAlert = alertType;
- }
+ SmsManager manager = SmsManager.getDefault();
+ manager.sendTextMessage(prefs.getSmsNumber(), null, alertMessage.toString(), null, null);
- /**
- private void showNotificationAlert (String message)
- {
-
- NotificationCompat.Builder mBuilder =
- new NotificationCompat.Builder(this)
- .setSmallIcon(R.drawable.ic_phone_alert)
- .setContentTitle(getString(R.string.app_name))
- .setContentText(message);
-
- Intent resultIntent = new Intent(this, MonitorActivity.class);
-
-// Because clicking the notification opens a new ("special") activity, there's
-// no need to create an artificial back stack.
- PendingIntent resultPendingIntent =
- PendingIntent.getActivity(
- this,
- 0,
- resultIntent,
- PendingIntent.FLAG_UPDATE_CURRENT
- );
-
- mBuilder.setContentIntent(resultPendingIntent);
-
- manager.notify(mNotificationAlertId++, mBuilder.build());
+ }
+ mLastEvent.save();
+ }
- }**/
}
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4659b8d..2ca72b5 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -6,7 +6,6 @@
<string name="menu_start">START</string>
-
<string name="title_activity_start">PhoneyPot</string>
<string name="accelerometer_prompt">
@@ -64,11 +63,9 @@
<item>Back</item>
</array>
- <string name="unlock_title">Set Unlock Pin</string>
-
- <string name="secure_service_started">Phoneypot monitoring activated</string>
+ <string name="secure_service_started">Phoneypot Activated</string>
- <string name="secure_service_stopped">Phoneypot monitoring deactivated</string>
+ <string name="secure_service_stopped">Phoneypot Deactivated</string>
- <string name="intrusion_detected">An intrusion was detected.</string>
+ <string name="intrusion_detected">An intrusion was detected. Capturing audio and photo evidence now.</string>
</resources>
\ No newline at end of file