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
Replace Event and EventTrigger with RoomDatabase
Arka Prava Basu096a22fd782a
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.javaindex 0a136d0..e29347d 100644--- a/src/main/java/org/havenapp/main/ListActivity.java+++ b/src/main/java/org/havenapp/main/ListActivity.java@@ -45,6 +45,7 @@ import android.view.View;import com.mikepenz.aboutlibraries.Libs;import com.mikepenz.aboutlibraries.LibsBuilder;+import org.havenapp.main.database.HavenEventDB;import org.havenapp.main.model.Event;import org.havenapp.main.service.SignalSender;import org.havenapp.main.ui.EventActivity;@@ -146,7 +147,7 @@ public class ListActivity extends AppCompatActivity {}try {- events = Event.listAll(Event.class, "id DESC");+ events = HavenEventDB.getDatabase(this).getEventDAO().getAllEvent();if (events.size() > 0) {findViewById(R.id.empty_view).setVisibility(View.GONE);@@ -182,7 +183,7 @@ public class ListActivity extends AppCompatActivity {{public void run (){- event.delete();+ HavenEventDB.getDatabase(ListActivity.this).getEventDAO().delete(event);}};@@ -191,14 +192,14 @@ public class ListActivity extends AppCompatActivity {events.remove(position);adapter.notifyItemRemoved(position);- event.delete();+ HavenEventDB.getDatabase(ListActivity.this).getEventDAO().delete(event);Snackbar.make(recyclerView, getString(R.string.event_deleted), Snackbar.LENGTH_SHORT).setAction(getString(R.string.undo), new View.OnClickListener() {@Overridepublic void onClick(View v) {handler.removeCallbacks(runnableDelete);- event.save();+ HavenEventDB.getDatabase(ListActivity.this).getEventDAO().insert(event);events.add(position, event);adapter.notifyItemInserted(position);}@@ -236,10 +237,10 @@ public class ListActivity extends AppCompatActivity {protected void onResume() {super.onResume();- final long newCount = Event.count(Event.class);+ final long newCount = HavenEventDB.getDatabase(this).getEventDAO().count();if (newCount > events.size()) {- events = Event.listAll(Event.class, "id DESC");+ events = HavenEventDB.getDatabase(this).getEventDAO().getAllEvent();adapter = new EventAdapter(ListActivity.this, events);recyclerView.setAdapter(adapter);@@ -330,7 +331,7 @@ public class ListActivity extends AppCompatActivity {public void run (){for (Event event : removedEvents) {- event.delete();+ HavenEventDB.getDatabase(ListActivity.this).getEventDAO().delete(event);}}};@@ -349,7 +350,7 @@ public class ListActivity extends AppCompatActivity {handler.removeCallbacks(runnableDelete);for (Event event : removedEvents) {- event.save();+ HavenEventDB.getDatabase(ListActivity.this).getEventDAO().insert(event);events.add(event);adapter.notifyItemInserted(events.size() - 1);}diff --git a/src/main/java/org/havenapp/main/dao/EventDAO.kt b/src/main/java/org/havenapp/main/dao/EventDAO.ktindex ffa3544..0449336 100644--- a/src/main/java/org/havenapp/main/dao/EventDAO.kt+++ b/src/main/java/org/havenapp/main/dao/EventDAO.kt@@ -1,7 +1,7 @@package org.havenapp.main.daoimport android.arch.persistence.room.*-import org.havenapp.main.model.EventRoom+import org.havenapp.main.model.Event/*** Created by Arka Prava Basu <[email protected]> on 23/5/18.@@ -10,14 +10,20 @@ import org.havenapp.main.model.EventRoominterface EventDAO {@Insert- fun insert(eventRoom: EventRoom)+ fun insert(event: Event)@Delete- fun delete(eventRoom: EventRoom)+ fun delete(event: Event)@Update- fun update(eventRoom: EventRoom)+ fun update(event: Event)@Query("SELECT * FROM event_table WHERE id = :id")- fun findById(id: Long) : EventRoom+ fun findById(id: Long) : Event++ @Query("SELECT * FROM event_table ORDER BY id")+ fun getAllEvent() : List<Event>++ @Query("SELECT COUNT(*) FROM event_table")+ fun count() : Int}\ No newline at end of filediff --git a/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt b/src/main/java/org/havenapp/main/dao/EventTriggerDAO.ktindex b48fc39..f7b46d2 100644--- a/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt+++ b/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt@@ -1,7 +1,7 @@package org.havenapp.main.daoimport android.arch.persistence.room.*-import org.havenapp.main.model.EventTriggerRoom+import org.havenapp.main.model.EventTrigger/*** Created by Arka Prava Basu <[email protected]> on 23/5/18.@@ -10,17 +10,17 @@ import org.havenapp.main.model.EventTriggerRoominterface EventTriggerDAO {@Insert- fun insert(eventTriggerRoom: EventTriggerRoom)+ fun insert(eventTrigger: EventTrigger)@Delete- fun delete(eventTriggerRoom: EventTriggerRoom)+ fun delete(eventTrigger: EventTrigger)@Update- fun update(eventTriggerRoom: EventTriggerRoom)+ fun update(eventTrigger: EventTrigger)@Query("SELECT * FROM event_trigger_table WHERE id = :id")- fun findById(id : Long) : EventTriggerRoom+ fun findById(id : Long) : EventTrigger@Query("SELECT * FROM event_trigger_table WHERE mEventId = :eventId")- fun getEventTriggerList(eventId: Long) : MutableList<EventTriggerRoom>+ fun getEventTriggerList(eventId: Long) : MutableList<EventTrigger>}\ No newline at end of filediff --git a/src/main/java/org/havenapp/main/database/HavenEventDB.kt b/src/main/java/org/havenapp/main/database/HavenEventDB.ktindex 3e0c3f6..8d639a7 100644--- a/src/main/java/org/havenapp/main/database/HavenEventDB.kt+++ b/src/main/java/org/havenapp/main/database/HavenEventDB.kt@@ -3,16 +3,19 @@ package org.havenapp.main.databaseimport android.arch.persistence.room.Databaseimport android.arch.persistence.room.Roomimport android.arch.persistence.room.RoomDatabase+import android.arch.persistence.room.TypeConvertersimport android.content.Contextimport org.havenapp.main.dao.EventDAOimport org.havenapp.main.dao.EventTriggerDAO-import org.havenapp.main.model.EventRoom-import org.havenapp.main.model.EventTriggerRoom+import org.havenapp.main.database.converter.HavenEventDBConverters+import org.havenapp.main.model.Event+import org.havenapp.main.model.EventTrigger/*** Created by Arka Prava Basu <[email protected]> on 23/5/18.*/-@Database(entities = [(EventRoom::class), (EventTriggerRoom::class)], version = 1)+@Database(entities = [(Event::class), (EventTrigger::class)], version = 1)+@TypeConverters(HavenEventDBConverters::class)abstract class HavenEventDB: RoomDatabase() {abstract fun getEventDAO(): EventDAO@@ -30,6 +33,7 @@ abstract class HavenEventDB: RoomDatabase() {if (INSTANCE == null) {INSTANCE = Room.databaseBuilder(context.applicationContext,HavenEventDB::class.java, "haven_database")+ .allowMainThreadQueries() // todo remove this.fallbackToDestructiveMigration().build()}diff --git a/src/main/java/org/havenapp/main/database/converter/HavenEventDBConverters.kt b/src/main/java/org/havenapp/main/database/converter/HavenEventDBConverters.ktnew file mode 100644index 0000000..ad06492--- /dev/null+++ b/src/main/java/org/havenapp/main/database/converter/HavenEventDBConverters.kt@@ -0,0 +1,24 @@+package org.havenapp.main.database.converter++import android.arch.persistence.room.TypeConverter+import java.util.*++/**+ * Created by Arka Prava Basu <[email protected]> on 25/5/18.+ */+class HavenEventDBConverters {+ companion object {++ @JvmStatic+ @TypeConverter+ fun fromTimestamp(value: Long?): Date? {+ return if (value == null) null else Date(value)+ }++ @JvmStatic+ @TypeConverter+ fun dateToTimestamp(date: Date?): Long? {+ return date?.time+ }+ }+}\ No newline at end of filediff --git a/src/main/java/org/havenapp/main/model/Event.java b/src/main/java/org/havenapp/main/model/Event.javadeleted file mode 100644index 617d909..0000000--- a/src/main/java/org/havenapp/main/model/Event.java+++ /dev/null@@ -1,64 +0,0 @@-package org.havenapp.main.model;--import com.orm.SugarRecord;-import com.orm.dsl.Ignore;--import java.io.File;-import java.util.ArrayList;-import java.util.Date;-import java.util.List;--/**- * Created by n8fr8 on 4/16/17.- */--public class Event extends SugarRecord {-- private Date mStartTime;-- @Ignore- private ArrayList<EventTrigger> mEventTriggers;-- public Event ()- {- mStartTime = new Date();- mEventTriggers = new ArrayList<>();- }-- public Date getStartTime ()- {- return mStartTime;- }-- @Override- public boolean delete() {- for (EventTrigger trigger : this.getEventTriggers()) {- File file = new File(trigger.getPath());-- if (!file.delete() || !trigger.delete()) {- return false;- }- }-- return super.delete();- }-- public void addEventTrigger (EventTrigger eventTrigger)- {- mEventTriggers.add(eventTrigger);- eventTrigger.setEventId(getId());- }-- public ArrayList<EventTrigger> getEventTriggers ()- {- if (mEventTriggers.size() == 0) {- List<EventTrigger> eventTriggers = EventTrigger.find(EventTrigger.class, "M_EVENT_ID = ?", getId() + "");-- mEventTriggers.addAll(eventTriggers);-- }-- return mEventTriggers;- }--}diff --git a/src/main/java/org/havenapp/main/model/EventRoom.kt b/src/main/java/org/havenapp/main/model/Event.ktsimilarity index 65%rename from src/main/java/org/havenapp/main/model/EventRoom.ktrename to src/main/java/org/havenapp/main/model/Event.ktindex 6c0059d..0111cec 100644--- a/src/main/java/org/havenapp/main/model/EventRoom.kt+++ b/src/main/java/org/havenapp/main/model/Event.kt@@ -10,25 +10,26 @@ import java.util.** Created by Arka Prava Basu <[email protected]> on 20/5/18.*/@Entity(tableName = "event_table")-class EventRoom {+class Event {@PrimaryKey(autoGenerate = true)- private var id : Long = 0+ var id : Long = 0+ get() = field- private var mStartTime : Date = Date()+ var mStartTime : Date = Date()@Ignore- private var mEventTriggers : MutableList<EventTriggerRoom> = mutableListOf()+ private var mEventTriggers : MutableList<EventTrigger> = mutableListOf()- fun addEventTrigger(eventTriggerRoom: EventTriggerRoom) {- mEventTriggers.add(eventTriggerRoom)- eventTriggerRoom.mEventId = id+ fun addEventTrigger(eventTrigger: EventTrigger) {+ mEventTriggers.add(eventTrigger)+ eventTrigger.mEventId = id}/*** Get the list of event triggers associated with this event*/- fun getEventTriggers() : MutableList<EventTriggerRoom> {+ fun getEventTriggers() : MutableList<EventTrigger> {if (mEventTriggers.size == 0) {val eventTriggers = HavenApp.dataBaseInstance.getEventTriggerDAO().getEventTriggerList(id)diff --git a/src/main/java/org/havenapp/main/model/EventTrigger.java b/src/main/java/org/havenapp/main/model/EventTrigger.javadeleted file mode 100644index 7e7aac6..0000000--- a/src/main/java/org/havenapp/main/model/EventTrigger.java+++ /dev/null@@ -1,162 +0,0 @@-package org.havenapp.main.model;--import android.content.Context;--import com.orm.SugarRecord;--import org.havenapp.main.R;--import java.util.Date;--/**- * Created by n8fr8 on 4/16/17.- */--public class EventTrigger extends SugarRecord {-- private int mType;- private Date mTime;- private long mEventId;-- private String mPath;-- /**- * Acceleration detected message- */- public static final int ACCELEROMETER = 0;-- /**- * Camera motion detected message- */- public static final int CAMERA = 1;-- /**- * Mic noise detected message- */- public static final int MICROPHONE = 2;-- /**- * Pressure change detected message- */- public static final int PRESSURE = 3;-- /**- * Light change detected message- */- public static final int LIGHT = 4;-- /**- * Power change detected message- */- public static final int POWER = 5;-- /**- * Significant motion detected message- */- public static final int BUMP = 6;-- /**- * Significant motion detected message- */- public static final int CAMERA_VIDEO = 7;-- /**- * Heartbeat notification message- */- public static final int HEART = 8;--- public EventTrigger ()- {- mTime = new Date();- }-- public void setType (int type)- {- mType = type;- }-- public int getType ()- {- return mType;- }-- public Date getTriggerTime ()- {- return mTime;- }-- public void setEventId (long eventId)- {- mEventId = eventId;- }-- public String getPath() {- return mPath;- }-- public void setPath(String mPath) {- this.mPath = mPath;- }--- public String getStringType (Context context)- {- String sType = "";-- switch (getType()) {- case EventTrigger.ACCELEROMETER:- sType = context.getString(R.string.sensor_accel);- break;- case EventTrigger.LIGHT:- sType = context.getString(R.string.sensor_light);- break;- case EventTrigger.CAMERA:- sType = context.getString(R.string.sensor_camera);- break;- case EventTrigger.MICROPHONE:- sType = context.getString(R.string.sensor_sound);- break;- case EventTrigger.POWER:- sType = context.getString(R.string.sensor_power);- break;- case EventTrigger.BUMP:- sType = context.getString(R.string.sensor_bump);- break;- case EventTrigger.CAMERA_VIDEO:- sType = context.getString(R.string.sensor_camera_video);- break;- case EventTrigger.HEART:- sType = context.getString(R.string.sensor_heartbeat);- break;- default:- sType = context.getString(R.string.sensor_unknown);- }-- return sType;-- }-- public String getMimeType ()- {- String sType = "";-- switch (getType()) {- case EventTrigger.CAMERA:- sType = "image/*";- break;- case EventTrigger.MICROPHONE:- sType = "audio/*";- break;- case EventTrigger.CAMERA_VIDEO:- sType = "video/*";- break;- default:- sType = null;- }-- return sType;-- }--}diff --git a/src/main/java/org/havenapp/main/model/EventTriggerRoom.kt b/src/main/java/org/havenapp/main/model/EventTrigger.ktsimilarity index 82%rename from src/main/java/org/havenapp/main/model/EventTriggerRoom.ktrename to src/main/java/org/havenapp/main/model/EventTrigger.ktindex e7d3703..6c9acc4 100644--- a/src/main/java/org/havenapp/main/model/EventTriggerRoom.kt+++ b/src/main/java/org/havenapp/main/model/EventTrigger.kt@@ -10,65 +10,66 @@ import java.util.** Created by Arka Prava Basu <[email protected]> on 22/5/18.*/@Entity(tableName = "event_trigger_table")-class EventTriggerRoom {+class EventTrigger {companion object {/*** Acceleration detected message*/- val ACCELEROMETER = 0+ const val ACCELEROMETER = 0/*** Camera motion detected message*/- val CAMERA = 1+ const val CAMERA = 1/*** Mic noise detected message*/- val MICROPHONE = 2+ const val MICROPHONE = 2/*** Pressure change detected message*/- val PRESSURE = 3+ const val PRESSURE = 3/*** Light change detected message*/- val LIGHT = 4+ const val LIGHT = 4/*** Power change detected message*/- val POWER = 5+ const val POWER = 5/*** Significant motion detected message*/- val BUMP = 6+ const val BUMP = 6/*** Significant motion detected message*/- val CAMERA_VIDEO = 7+ const val CAMERA_VIDEO = 7/*** Heartbeat notification message*/- val HEART = 8+ const val HEART = 8}@PrimaryKey(autoGenerate = true)- private var id : Long = 0+ var id : Long = 0+ get() = field- private var mType: Int = 0+ var mType: Int = 0// Trigger time- private val mTime: Date = Date()+ var mTime: Date = Date()var mEventId: Long = 0- private var mPath: String? = null+ var mPath: String? = nullfun getStringType(context: Context): String {var sType = ""diff --git a/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.javaindex c6415e7..4f88190 100644--- a/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java+++ b/src/main/java/org/havenapp/main/sensors/AccelerometerMonitor.java@@ -13,7 +13,6 @@ import android.os.IBinder;import android.os.Message;import android.os.Messenger;import android.os.RemoteException;-import android.util.FloatMath;import android.util.Log;import org.havenapp.main.PreferenceManager;diff --git a/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.java b/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.javaindex 39e4bf8..fb584bc 100644--- a/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.java+++ b/src/main/java/org/havenapp/main/sensors/PowerConnectionReceiver.java@@ -3,8 +3,6 @@ package org.havenapp.main.sensors;import android.content.BroadcastReceiver;import android.content.Context;import android.content.Intent;-import android.os.BatteryManager;-import android.util.Log;import org.havenapp.main.R;import org.havenapp.main.model.EventTrigger;diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.javaindex 43a6285..b3310f0 100644--- a/src/main/java/org/havenapp/main/service/MonitorService.java+++ b/src/main/java/org/havenapp/main/service/MonitorService.java@@ -31,6 +31,7 @@ import org.havenapp.main.HavenApp;import org.havenapp.main.MonitorActivity;import org.havenapp.main.PreferenceManager;import org.havenapp.main.R;+import org.havenapp.main.database.HavenEventDB;import org.havenapp.main.model.Event;import org.havenapp.main.model.EventTrigger;import org.havenapp.main.sensors.AccelerometerMonitor;@@ -286,7 +287,7 @@ public class MonitorService extends Service {if (mLastEvent == null) {mLastEvent = new Event();- mLastEvent.save();+ HavenEventDB.getDatabase(getApplicationContext()).getEventDAO().insert(mLastEvent);doNotification = true;}else if (mPrefs.getNotificationTimeMs() == 0)@@ -304,13 +305,13 @@ public class MonitorService extends Service {}EventTrigger eventTrigger = new EventTrigger();- eventTrigger.setType(alertType);- eventTrigger.setPath(path);+ eventTrigger.setMType(alertType);+ eventTrigger.setMPath(path);mLastEvent.addEventTrigger(eventTrigger);//we don't need to resave the event, only the trigger- eventTrigger.save();+ HavenEventDB.getDatabase(getApplicationContext()).getEventTriggerDAO().insert(eventTrigger);if (doNotification) {@@ -336,13 +337,13 @@ public class MonitorService extends Service {recips.add(st.nextToken());String attachment = null;- if (eventTrigger.getType() == EventTrigger.CAMERA) {- attachment = eventTrigger.getPath();- } else if (eventTrigger.getType() == EventTrigger.MICROPHONE) {- attachment = eventTrigger.getPath();+ if (eventTrigger.getMType() == EventTrigger.CAMERA) {+ attachment = eventTrigger.getMPath();+ } else if (eventTrigger.getMType() == EventTrigger.MICROPHONE) {+ attachment = eventTrigger.getMPath();}- else if (eventTrigger.getType() == EventTrigger.CAMERA_VIDEO) {- attachment = eventTrigger.getPath();+ else if (eventTrigger.getMType() == EventTrigger.CAMERA_VIDEO) {+ attachment = eventTrigger.getMPath();}sender.sendMessage(recips, alertMessage.toString(), attachment);diff --git a/src/main/java/org/havenapp/main/service/WebServer.java b/src/main/java/org/havenapp/main/service/WebServer.javaindex 6057581..ea65019 100644--- a/src/main/java/org/havenapp/main/service/WebServer.java+++ b/src/main/java/org/havenapp/main/service/WebServer.java@@ -6,6 +6,7 @@ import android.text.TextUtils;import android.util.Log;import org.havenapp.main.R;+import org.havenapp.main.database.HavenEventDB;import org.havenapp.main.model.Event;import org.havenapp.main.model.EventTrigger;@@ -91,10 +92,11 @@ public class WebServer extends NanoHTTPD {//long eventId = Long.parseLong(pathSegs.get(1));long eventTriggerId = Long.parseLong(pathSegs.get(3));- EventTrigger eventTrigger = EventTrigger.findById(EventTrigger.class, eventTriggerId);+ EventTrigger eventTrigger = HavenEventDB.getDatabase(mContext).getEventTriggerDAO()+ .findById(eventTriggerId);try {- File fileMedia = new File(eventTrigger.getPath());+ File fileMedia = new File(eventTrigger.getMPath());FileInputStream fis = new FileInputStream(fileMedia);return newChunkedResponse(Response.Status.OK, getMimeType(eventTrigger), fis);@@ -121,7 +123,8 @@ public class WebServer extends NanoHTTPD {try {if (pathSegs.size() == 2 && pathSegs.get(0).equals("event")) {long eventId = Long.parseLong(pathSegs.get(1));- Event event = Event.findById(Event.class, eventId);+ Event event = HavenEventDB.getDatabase(mContext)+ .getEventDAO().findById(eventId);showEvent(event, page);}@@ -164,12 +167,12 @@ public class WebServer extends NanoHTTPD {List<EventTrigger> triggers = event.getEventTriggers();- page.append("<h1>Event: ").append(event.getStartTime().toLocaleString()).append("</h1><hr/>\n");+ page.append("<h1>Event: ").append(event.getMStartTime().toLocaleString()).append("</h1><hr/>\n");for (EventTrigger eventTrigger: triggers){String title = eventTrigger.getStringType(mContext);- String desc = eventTrigger.getTriggerTime().toString();+ String desc = eventTrigger.getMTime().toString();page.append("<b>");page.append(title).append("</b><br/>");@@ -177,13 +180,13 @@ public class WebServer extends NanoHTTPD {String mediaPath = "/event/" + event.getId() + "/trigger/" + eventTrigger.getId();- if (eventTrigger.getType() == EventTrigger.CAMERA)+ if (eventTrigger.getMType() == EventTrigger.CAMERA){page.append("<img src=\"").append(mediaPath).append("\" width=\"100%\"/>");page.append("<a href=\"").append(mediaPath).append("\">Download Media").append("</a>");}- else if (eventTrigger.getType() == EventTrigger.MICROPHONE)+ else if (eventTrigger.getMType() == EventTrigger.MICROPHONE){page.append("<audio src=\"").append(mediaPath).append("\"></audio>");page.append("<a href=\"").append(mediaPath).append("\">Download Media").append("</a>");@@ -202,11 +205,11 @@ public class WebServer extends NanoHTTPD {{page.append("<h1>Events</h1><hr/>\n");- List<Event> events = Event.listAll(Event.class);+ List<Event> events = HavenEventDB.getDatabase(mContext).getEventDAO().getAllEvent();for (Event event: events){- String title = event.getStartTime().toLocaleString();+ String title = event.getMStartTime().toLocaleString();String desc = event.getEventTriggers().size() + " triggered events";page.append("<b>").append("<a href=\"/event/").append(event.getId()).append("\">");@@ -221,7 +224,7 @@ public class WebServer extends NanoHTTPD {{String sType = "";- switch (eventTrigger.getType()) {+ switch (eventTrigger.getMType()) {case EventTrigger.CAMERA:sType = "image/jpeg";break;diff --git a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.javaindex ae6efb4..57bb64e 100644--- a/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java+++ b/src/main/java/org/havenapp/main/ui/AccelConfigureActivity.java@@ -10,12 +10,9 @@ import android.hardware.SensorEvent;import android.hardware.SensorEventListener;import android.hardware.SensorManager;import android.os.Bundle;-import android.os.Message;-import android.os.RemoteException;import android.support.v7.app.AppCompatActivity;import android.support.v7.widget.Toolbar;import android.util.Log;-import android.view.Menu;import android.view.MenuItem;import android.widget.TextView;@@ -23,11 +20,9 @@ import com.maxproj.simplewaveform.SimpleWaveform;import org.havenapp.main.PreferenceManager;import org.havenapp.main.R;-import org.havenapp.main.model.EventTrigger;import java.util.LinkedList;-import me.angrybyte.numberpicker.listener.OnValueChangeListener;import me.angrybyte.numberpicker.view.ActualNumberPicker;public class AccelConfigureActivity extends AppCompatActivity implements SensorEventListener {diff --git a/src/main/java/org/havenapp/main/ui/EventActivity.java b/src/main/java/org/havenapp/main/ui/EventActivity.javaindex 309201f..b262b06 100644--- a/src/main/java/org/havenapp/main/ui/EventActivity.java+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java@@ -16,6 +16,7 @@ import android.view.MenuItem;import android.view.View;import org.havenapp.main.R;+import org.havenapp.main.database.HavenEventDB;import org.havenapp.main.model.Event;import org.havenapp.main.model.EventTrigger;@@ -45,10 +46,10 @@ public class EventActivity extends AppCompatActivity {if (eventId != -1) {- mEvent = Event.findById(Event.class, eventId);+ mEvent = HavenEventDB.getDatabase(this).getEventDAO().findById(eventId);mRecyclerView = findViewById(R.id.event_trigger_list);- setTitle(mEvent.getStartTime().toLocaleString());+ setTitle(mEvent.getMStartTime().toLocaleString());mAdapter = new EventTriggerAdapter(this, mEvent.getEventTriggers());@@ -78,7 +79,8 @@ public class EventActivity extends AppCompatActivity {//Remove swiped item from list and notify the RecyclerViewfinal int position = viewHolder.getAdapterPosition();- final EventTrigger eventTrigger = mEvent.getEventTriggers().get(viewHolder.getAdapterPosition());+ final EventTrigger eventTrigger = mEvent.getEventTriggers()+ .get(viewHolder.getAdapterPosition());deleteEventTrigger (eventTrigger, position);@@ -115,8 +117,11 @@ public class EventActivity extends AppCompatActivity {public void run (){- new File(eventTrigger.getPath()).delete();- eventTrigger.delete();+ if (eventTrigger.getMPath() != null) {+ new File(eventTrigger.getMPath()).delete();+ }+ HavenEventDB.getDatabase(EventActivity.this)+ .getEventTriggerDAO().delete(eventTrigger);}};@@ -126,14 +131,16 @@ public class EventActivity extends AppCompatActivity {mEvent.getEventTriggers().remove(position);mAdapter.notifyItemRemoved(position);- eventTrigger.delete();+ HavenEventDB.getDatabase(EventActivity.this)+ .getEventTriggerDAO().delete(eventTrigger);Snackbar.make(mRecyclerView, "Event Trigger deleted", Snackbar.LENGTH_SHORT).setAction("UNDO", new View.OnClickListener() {@Overridepublic void onClick(View v) {mHandler.removeCallbacks(runnableDelete);- eventTrigger.save();+ HavenEventDB.getDatabase(EventActivity.this)+ .getEventTriggerDAO().insert(eventTrigger);mEvent.getEventTriggers().add(position, eventTrigger);mAdapter.notifyItemInserted(position);}@@ -143,7 +150,7 @@ public class EventActivity extends AppCompatActivity {private void shareEvent (){- String title = "Phoneypot: " + mEvent.getStartTime().toLocaleString();+ String title = "Phoneypot: " + mEvent.getMStartTime().toLocaleString();//need to "send multiple" to get more than one attachmentfinal Intent emailIntent = new Intent(Intent.ACTION_SEND_MULTIPLE);@@ -156,7 +163,10 @@ public class EventActivity extends AppCompatActivity {//convert from paths to Android friendly Parcelable Uri'sfor (EventTrigger trigger : mEvent.getEventTriggers()){- File fileIn = new File(trigger.getPath());+ if (trigger.getMPath() == null)+ continue;++ File fileIn = new File(trigger.getMPath());Uri u = Uri.fromFile(fileIn);uris.add(u);}@@ -168,11 +178,11 @@ public class EventActivity extends AppCompatActivity {private String generateLog () {StringBuilder mEventLog = new StringBuilder();- setTitle("Event @ " + mEvent.getStartTime().toLocaleString());+ setTitle("Event @ " + mEvent.getMStartTime().toLocaleString());for (EventTrigger eventTrigger : mEvent.getEventTriggers()) {- mEventLog.append("Event Triggered @ ").append(eventTrigger.getTriggerTime().toString()).append("\n");+ mEventLog.append("Event Triggered @ ").append(eventTrigger.getMTime().toString()).append("\n");String sType = eventTrigger.getStringType(this);diff --git a/src/main/java/org/havenapp/main/ui/EventAdapter.java b/src/main/java/org/havenapp/main/ui/EventAdapter.javaindex 7d1d73f..1048020 100644--- a/src/main/java/org/havenapp/main/ui/EventAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventAdapter.java@@ -41,7 +41,7 @@ public class EventAdapter extends RecyclerView.Adapter<EventAdapter.EventVH> {Event event = events.get(position);- String title = event.getStartTime().toLocaleString();+ String title = event.getMStartTime().toLocaleString();String desc = event.getEventTriggers().size() + " " + context.getString(R.string.detection_events);holder.title.setText(title);diff --git a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.javaindex e619037..a60e98c 100644--- a/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java+++ b/src/main/java/org/havenapp/main/ui/EventTriggerAdapter.java@@ -47,9 +47,9 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdaptethis.eventTriggerImagePaths = new ArrayList<>();for (EventTrigger trigger : eventTriggers){- if (trigger.getType() == EventTrigger.CAMERA)+ if (trigger.getMType() == EventTrigger.CAMERA){- eventTriggerImagePaths.add("file:///" + trigger.getPath());+ eventTriggerImagePaths.add("file:///" + trigger.getMPath());}}}@@ -68,7 +68,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdaptefinal EventTrigger eventTrigger = eventTriggers.get(position);String title = eventTrigger.getStringType(context);- String desc = eventTrigger.getTriggerTime().toLocaleString();+ String desc = eventTrigger.getMTime().toLocaleString();holder.image.setVisibility(View.GONE);holder.video.setVisibility(View.GONE);@@ -76,19 +76,21 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapteholder.sound.setVisibility(View.GONE);- if (eventTrigger.getPath() != null)+ if (eventTrigger.getMPath() != null){- switch (eventTrigger.getType()) {+ switch (eventTrigger.getMType()) {case EventTrigger.CAMERA_VIDEO:holder.video.setVisibility(View.VISIBLE);- BitmapDrawable bitmapD = new BitmapDrawable(context.getResources(), ThumbnailUtils.createVideoThumbnail(eventTrigger.getPath(),+ BitmapDrawable bitmapD = new BitmapDrawable(context.getResources(),+ ThumbnailUtils.createVideoThumbnail(eventTrigger.getMPath(),MediaStore.Video.Thumbnails.FULL_SCREEN_KIND));holder.video.setBackground(bitmapD);holder.video.setOnClickListener(new View.OnClickListener() {@Overridepublic void onClick(View view) {- Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(eventTrigger.getPath()));- intent.setDataAndType(Uri.parse(eventTrigger.getPath()), "video/*");+ Intent intent = new Intent(Intent.ACTION_VIEW,+ Uri.parse(eventTrigger.getMPath()));+ intent.setDataAndType(Uri.parse(eventTrigger.getMPath()), "video/*");context.startActivity(intent);}});@@ -103,14 +105,14 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdaptebreak;case EventTrigger.CAMERA:holder.image.setVisibility(View.VISIBLE);- Picasso.with(context).load(new File(eventTrigger.getPath())).into(holder.image);+ Picasso.with(context).load(new File(eventTrigger.getMPath())).into(holder.image);holder.image.setOnClickListener(new View.OnClickListener() {@Overridepublic void onClick(View view) {int startPosition = 0;for (int i = 0; i < eventTriggerImagePaths.size(); i++) {- if (eventTriggerImagePaths.get(i).contains(eventTrigger.getPath())) {+ if (eventTriggerImagePaths.get(i).contains(eventTrigger.getMPath())) {startPosition = i;break;}@@ -140,7 +142,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapteLayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);holder.sound.setVisibility(View.VISIBLE);- final File fileSound = new File(eventTrigger.getPath());+ final File fileSound = new File(eventTrigger.getMPath());try {final SoundFile soundFile = SoundFile.create(fileSound.getPath(), new SoundFile.ProgressListener() {int lastProgress = 0;@@ -171,18 +173,18 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdaptebreak;case EventTrigger.ACCELEROMETER:- desc += "\n" + context.getString(R.string.data_speed) + ": " + eventTrigger.getPath();+ desc += "\n" + context.getString(R.string.data_speed) + ": " + eventTrigger.getMPath();break;case EventTrigger.LIGHT:- desc += "\n" + context.getString(R.string.data_light) + ": " + eventTrigger.getPath();+ desc += "\n" + context.getString(R.string.data_light) + ": " + eventTrigger.getMPath();break;case EventTrigger.PRESSURE:- desc += "\n" + context.getString(R.string.data_pressure) + ": " + eventTrigger.getPath();+ desc += "\n" + context.getString(R.string.data_pressure) + ": " + eventTrigger.getMPath();break;case EventTrigger.POWER:- desc += "\n" + context.getString(R.string.data_power) + ": " + eventTrigger.getPath();+ desc += "\n" + context.getString(R.string.data_power) + ": " + eventTrigger.getMPath();break;}@@ -206,7 +208,7 @@ public class EventTriggerAdapter extends RecyclerView.Adapter<EventTriggerAdapteIntent shareIntent = new Intent();shareIntent.setAction(Intent.ACTION_SEND);- shareIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(new File(eventTrigger.getPath())));+ shareIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(new File(eventTrigger.getMPath())));shareIntent.setType(eventTrigger.getMimeType());context.startActivity(shareIntent);