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
Migrate from Sugar ORM to Room
Arka Prava Basu108f3888f2db
diff --git a/src/main/java/org/havenapp/main/database/HavenEventDB.kt b/src/main/java/org/havenapp/main/database/HavenEventDB.ktindex 21cdc99..ca8f83c 100644--- a/src/main/java/org/havenapp/main/database/HavenEventDB.kt+++ b/src/main/java/org/havenapp/main/database/HavenEventDB.kt@@ -8,13 +8,14 @@ import android.content.Contextimport org.havenapp.main.dao.EventDAOimport org.havenapp.main.dao.EventTriggerDAOimport org.havenapp.main.database.converter.HavenEventDBConverters+import org.havenapp.main.database.migration.RoomMigrationimport org.havenapp.main.model.Eventimport org.havenapp.main.model.EventTrigger/*** Created by Arka Prava Basu <[email protected]> on 23/5/18.*/-@Database(entities = [(Event::class), (EventTrigger::class)], version = 3)+@Database(entities = [(Event::class), (EventTrigger::class)], version = 4)@TypeConverters(HavenEventDBConverters::class)abstract class HavenEventDB: RoomDatabase() {@@ -34,6 +35,7 @@ abstract class HavenEventDB: RoomDatabase() {INSTANCE = Room.databaseBuilder(context.applicationContext,HavenEventDB::class.java, "haven.db").allowMainThreadQueries() // todo remove this+ .addMigrations(RoomMigration()).build()}}diff --git a/src/main/java/org/havenapp/main/database/migration/RoomMigration.kt b/src/main/java/org/havenapp/main/database/migration/RoomMigration.ktnew file mode 100644index 0000000..dd9edde--- /dev/null+++ b/src/main/java/org/havenapp/main/database/migration/RoomMigration.kt@@ -0,0 +1,16 @@+package org.havenapp.main.database.migration++import android.arch.persistence.db.SupportSQLiteDatabase+import android.arch.persistence.room.migration.Migration++/**+ * [Migration] for the transition from Sugar ORM (database version = 3)+ * to Room database (database version = 4).+ * <p>+ * Created by Arka Prava Basu <[email protected]> on 28/8/18.+ */+class RoomMigration: Migration(3, 4) {+ override fun migrate(database: SupportSQLiteDatabase) {+ // Since we did not alter table, nothing to do here.+ }+}diff --git a/src/main/java/org/havenapp/main/service/MonitorService.java b/src/main/java/org/havenapp/main/service/MonitorService.javaindex 2a22e83..f47ce50 100644--- a/src/main/java/org/havenapp/main/service/MonitorService.java+++ b/src/main/java/org/havenapp/main/service/MonitorService.java@@ -299,7 +299,7 @@ public class MonitorService extends Service {mLastEvent.setId(eventId);doNotification = true;// set current event start date in prefs- mPrefs.setCurrentSession(mLastEvent.getStartTime());+ mPrefs.setCurrentSession(mLastEvent.getMStartTime());}else if (mPrefs.getNotificationTimeMs() == 0){