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

Bug fix: show event triggers corresponding to events

Arka Prava Basu482364f83787
diff --git a/src/main/java/org/havenapp/main/ListActivity.java b/src/main/java/org/havenapp/main/ListActivity.java
index 40338dc..85871bc 100644
--- a/src/main/java/org/havenapp/main/ListActivity.java
+++ b/src/main/java/org/havenapp/main/ListActivity.java
@@ -199,7 +199,9 @@ public class ListActivity extends AppCompatActivity {
@Override
public void onClick(View v) {
handler.removeCallbacks(runnableDelete);
- HavenEventDB.getDatabase(ListActivity.this).getEventDAO().insert(event);
+ long eventId = HavenEventDB.getDatabase(ListActivity.this)
+ .getEventDAO().insert(event);
+ event.setId(eventId);
events.add(position, event);
adapter.notifyItemInserted(position);
}
@@ -350,7 +352,9 @@ public class ListActivity extends AppCompatActivity {
handler.removeCallbacks(runnableDelete);
for (Event event : removedEvents) {
- HavenEventDB.getDatabase(ListActivity.this).getEventDAO().insert(event);
+ long eventId = HavenEventDB.getDatabase(ListActivity.this)
+ .getEventDAO().insert(event);
+ event.setId(eventId);
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.kt
index 93dbff0..829bb8f 100644
--- a/src/main/java/org/havenapp/main/dao/EventDAO.kt
+++ b/src/main/java/org/havenapp/main/dao/EventDAO.kt
@@ -10,7 +10,7 @@ import org.havenapp.main.model.Event
interface EventDAO {
@Insert
- fun insert(event: Event)
+ fun insert(event: Event): Long
@Delete
fun delete(event: Event)
diff --git a/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt b/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt
index f7b46d2..079d7c9 100644
--- a/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt
+++ b/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt
@@ -10,7 +10,7 @@ import org.havenapp.main.model.EventTrigger
interface EventTriggerDAO {
@Insert
- fun insert(eventTrigger: EventTrigger)
+ fun insert(eventTrigger: EventTrigger) : Long
@Delete
fun delete(eventTrigger: EventTrigger)
@@ -23,4 +23,7 @@ interface EventTriggerDAO {
@Query("SELECT * FROM event_trigger_table WHERE mEventId = :eventId")
fun getEventTriggerList(eventId: Long) : MutableList<EventTrigger>
+
+ @Query("SELECT * FROM event_trigger_table")
+ fun getAllEventTriggers() : MutableList<EventTrigger>
}
\ No newline at end of file
diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.java
index b3310f0..acc3386 100644
--- a/src/main/java/org/havenapp/main/service/MonitorService.java
+++ b/src/main/java/org/havenapp/main/service/MonitorService.java
@@ -287,7 +287,9 @@ public class MonitorService extends Service {
if (mLastEvent == null) {
mLastEvent = new Event();
- HavenEventDB.getDatabase(getApplicationContext()).getEventDAO().insert(mLastEvent);
+ long eventId = HavenEventDB.getDatabase(getApplicationContext())
+ .getEventDAO().insert(mLastEvent);
+ mLastEvent.setId(eventId);
doNotification = true;
}
else if (mPrefs.getNotificationTimeMs() == 0)
@@ -311,7 +313,9 @@ public class MonitorService extends Service {
mLastEvent.addEventTrigger(eventTrigger);
//we don't need to resave the event, only the trigger
- HavenEventDB.getDatabase(getApplicationContext()).getEventTriggerDAO().insert(eventTrigger);
+ long eventTriggerId = HavenEventDB.getDatabase(getApplicationContext())
+ .getEventTriggerDAO().insert(eventTrigger);
+ eventTrigger.setId(eventTriggerId);
if (doNotification) {
diff --git a/src/main/java/org/havenapp/main/ui/EventActivity.java b/src/main/java/org/havenapp/main/ui/EventActivity.java
index b262b06..d92a7a4 100644
--- a/src/main/java/org/havenapp/main/ui/EventActivity.java
+++ b/src/main/java/org/havenapp/main/ui/EventActivity.java
@@ -139,8 +139,9 @@ public class EventActivity extends AppCompatActivity {
@Override
public void onClick(View v) {
mHandler.removeCallbacks(runnableDelete);
- HavenEventDB.getDatabase(EventActivity.this)
+ long eventTriggerId = HavenEventDB.getDatabase(EventActivity.this)
.getEventTriggerDAO().insert(eventTrigger);
+ eventTrigger.setId(eventTriggerId);
mEvent.getEventTriggers().add(position, eventTrigger);
mAdapter.notifyItemInserted(position);
}