diff --git a/app/src/main/java/net/vonforst/evmap/storage/Database.kt b/app/src/main/java/net/vonforst/evmap/storage/Database.kt index e5eec253..c69b9e0b 100644 --- a/app/src/main/java/net/vonforst/evmap/storage/Database.kt +++ b/app/src/main/java/net/vonforst/evmap/storage/Database.kt @@ -4,22 +4,20 @@ import android.annotation.SuppressLint import android.content.ContentValues import android.content.Context import android.database.sqlite.SQLiteDatabase -import androidx.lifecycle.map import androidx.room.Database import androidx.room.RoomDatabase import androidx.room.TypeConverters import androidx.room.migration.Migration import androidx.sqlite.db.SupportSQLiteDatabase -import co.anbora.labs.spatia.builder.SpatiaBuilder import co.anbora.labs.spatia.builder.SpatiaRoom import co.anbora.labs.spatia.geometry.GeometryConverters +import kotlinx.coroutines.runBlocking import net.vonforst.evmap.api.goingelectric.GEChargeCard import net.vonforst.evmap.api.goingelectric.GEChargepoint import net.vonforst.evmap.api.openchargemap.OCMConnectionType import net.vonforst.evmap.api.openchargemap.OCMCountry import net.vonforst.evmap.api.openchargemap.OCMOperator import net.vonforst.evmap.model.* -import net.vonforst.evmap.viewmodel.await @Database( entities = [ @@ -37,7 +35,7 @@ import net.vonforst.evmap.viewmodel.await OCMCountry::class, OCMOperator::class, SavedRegion::class - ], version = 20 + ], version = 21 ) @TypeConverters(Converters::class, GeometryConverters::class) abstract class AppDatabase : RoomDatabase() { @@ -77,7 +75,7 @@ abstract class AppDatabase : RoomDatabase() { MIGRATION_2, MIGRATION_3, MIGRATION_4, MIGRATION_5, MIGRATION_6, MIGRATION_7, MIGRATION_8, MIGRATION_9, MIGRATION_10, MIGRATION_11, MIGRATION_12, MIGRATION_13, MIGRATION_14, MIGRATION_15, MIGRATION_16, - MIGRATION_17, MIGRATION_18, MIGRATION_19, MIGRATION_20 + MIGRATION_17, MIGRATION_18, MIGRATION_19, MIGRATION_20, MIGRATION_21 ) .addCallback(object : Callback() { override fun onCreate(db: SupportSQLiteDatabase) { @@ -447,6 +445,13 @@ abstract class AppDatabase : RoomDatabase() { } } } + + private val MIGRATION_21 = object : Migration(20, 21) { + override fun migrate(db: SupportSQLiteDatabase) { + // clear cache with this update + db.execSQL("DELETE FROM savedregion") + } + } } /**