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
Make database migration ready
Arka Prava Basua77960d57f90
diff --git a/src/main/java/org/havenapp/main/dao/EventDAO.kt b/src/main/java/org/havenapp/main/dao/EventDAO.ktindex 829bb8f..65ff890 100644--- a/src/main/java/org/havenapp/main/dao/EventDAO.kt+++ b/src/main/java/org/havenapp/main/dao/EventDAO.kt@@ -18,15 +18,15 @@ interface EventDAO {@Updatefun update(event: Event)- @Query("SELECT * FROM event_table WHERE id = :id")- fun findById(id: Long) : Event+ @Query("SELECT * FROM EVENT WHERE ID = :id")+ fun findById(id: Long?) : Event- @Query("SELECT * FROM event_table ORDER BY id")+ @Query("SELECT * FROM EVENT ORDER BY ID")fun getAllEvent() : List<Event>- @Query("SELECT * FROM event_table ORDER BY id DESC")+ @Query("SELECT * FROM EVENT ORDER BY ID DESC")fun getAllEventDesc() : List<Event>- @Query("SELECT COUNT(*) FROM event_table")+ @Query("SELECT COUNT(*) FROM EVENT")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 079d7c9..543ba66 100644--- a/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt+++ b/src/main/java/org/havenapp/main/dao/EventTriggerDAO.kt@@ -18,12 +18,12 @@ interface EventTriggerDAO {@Updatefun update(eventTrigger: EventTrigger)- @Query("SELECT * FROM event_trigger_table WHERE id = :id")- fun findById(id : Long) : EventTrigger+ @Query("SELECT * FROM EVENT_TRIGGER WHERE ID = :id")+ fun findById(id : Long?) : EventTrigger- @Query("SELECT * FROM event_trigger_table WHERE mEventId = :eventId")- fun getEventTriggerList(eventId: Long) : MutableList<EventTrigger>+ @Query("SELECT * FROM EVENT_TRIGGER WHERE M_EVENT_ID = :eventId")+ fun getEventTriggerList(eventId: Long?) : MutableList<EventTrigger>- @Query("SELECT * FROM event_trigger_table")+ @Query("SELECT * FROM EVENT_TRIGGER")fun getAllEventTriggers() : 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 8d639a7..21cdc99 100644--- a/src/main/java/org/havenapp/main/database/HavenEventDB.kt+++ b/src/main/java/org/havenapp/main/database/HavenEventDB.kt@@ -14,7 +14,7 @@ import org.havenapp.main.model.EventTrigger/*** Created by Arka Prava Basu <[email protected]> on 23/5/18.*/-@Database(entities = [(Event::class), (EventTrigger::class)], version = 1)+@Database(entities = [(Event::class), (EventTrigger::class)], version = 3)@TypeConverters(HavenEventDBConverters::class)abstract class HavenEventDB: RoomDatabase() {@@ -32,9 +32,8 @@ abstract class HavenEventDB: RoomDatabase() {synchronized(HavenEventDB::class) {if (INSTANCE == null) {INSTANCE = Room.databaseBuilder(context.applicationContext,- HavenEventDB::class.java, "haven_database")+ HavenEventDB::class.java, "haven.db").allowMainThreadQueries() // todo remove this- .fallbackToDestructiveMigration().build()}}diff --git a/src/main/java/org/havenapp/main/model/Event.kt b/src/main/java/org/havenapp/main/model/Event.ktindex 0111cec..1c9ad12 100644--- a/src/main/java/org/havenapp/main/model/Event.kt+++ b/src/main/java/org/havenapp/main/model/Event.kt@@ -1,5 +1,6 @@package org.havenapp.main.model+import android.arch.persistence.room.ColumnInfoimport android.arch.persistence.room.Entityimport android.arch.persistence.room.Ignoreimport android.arch.persistence.room.PrimaryKey@@ -9,14 +10,16 @@ import java.util.*/*** Created by Arka Prava Basu <[email protected]> on 20/5/18.*/-@Entity(tableName = "event_table")+@Entity(tableName = "EVENT")class Event {@PrimaryKey(autoGenerate = true)- var id : Long = 0+ @ColumnInfo(name = "ID")+ var id : Long? = nullget() = field- var mStartTime : Date = Date()+ @ColumnInfo(name = "M_START_TIME")+ var mStartTime : Date? = Date()@Ignoreprivate var mEventTriggers : MutableList<EventTrigger> = mutableListOf()diff --git a/src/main/java/org/havenapp/main/model/EventTrigger.kt b/src/main/java/org/havenapp/main/model/EventTrigger.ktindex 6c9acc4..ee687a4 100644--- a/src/main/java/org/havenapp/main/model/EventTrigger.kt+++ b/src/main/java/org/havenapp/main/model/EventTrigger.kt@@ -1,5 +1,6 @@package org.havenapp.main.model+import android.arch.persistence.room.ColumnInfoimport android.arch.persistence.room.Entityimport android.arch.persistence.room.PrimaryKeyimport android.content.Context@@ -9,7 +10,7 @@ import java.util.*/*** Created by Arka Prava Basu <[email protected]> on 22/5/18.*/-@Entity(tableName = "event_trigger_table")+@Entity(tableName = "EVENT_TRIGGER")class EventTrigger {companion object {/**@@ -59,16 +60,21 @@ class EventTrigger {}@PrimaryKey(autoGenerate = true)- var id : Long = 0+ @ColumnInfo(name = "ID")+ var id : Long? = nullget() = field- var mType: Int = 0+ @ColumnInfo(name = "M_TYPE")+ var mType: Int? = 0// Trigger time- var mTime: Date = Date()+ @ColumnInfo(name = "M_TIME")+ var mTime: Date? = Date()- var mEventId: Long = 0+ @ColumnInfo(name = "M_EVENT_ID")+ var mEventId: Long? = 0+ @ColumnInfo(name = "M_PATH")var mPath: String? = nullfun getStringType(context: Context): String {