feat: migrate from v1 to v2 db

.gitignore

@@ -51,6 +51,9 @@ out/
 build/
 !gradle/wrapper/gradle-wrapper.jar
 
+# Lock file the Room Gradle plugin drops in a module root when it copies schemas
+*.lck
+
 # Signing files
 .signing/
 

app/build.gradle.kts

@@ -116,7 +116,8 @@ dependencies {
     implementation(projects.feature.creditCard)
     implementation(projects.feature.autofill)
     implementation(projects.feature.settings)
-    implementation(projects.migrationCreateAccess)
+    implementation(projects.migration.createAccess)
+    implementation(projects.migration.legacyData)
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)

build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.androidx.room) apply false
+    alias(libs.plugins.androidx.room3) apply false
     alias(libs.plugins.kotlin.parcelize) apply false
     alias(libs.plugins.kotlin.compose) apply false
     alias(libs.plugins.kotlin.serialization) apply false

core/item/schemas/de.davis.keygo.core.item.data.local.datasource.ItemDatabase/1.json

@@ -2,7 +2,7 @@
   "formatVersion": 1,
   "database": {
     "version": 1,
-    "identityHash": "d827ca95e51c22ef1dc56c2eb260f41c",
+    "identityHash": "4f0b0d6a7ba5ff447e745fb0f08d8be3",
     "entities": [
       {
         "tableName": "vault",
@@ -54,7 +54,7 @@
       },
       {
         "tableName": "item",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` BLOB NOT NULL, `vault_id` BLOB NOT NULL, `name` TEXT NOT NULL, `note` TEXT, `item_type` TEXT NOT NULL, `pinned` INTEGER NOT NULL, `wrapped_key` BLOB NOT NULL, `key_nonce` BLOB NOT NULL, PRIMARY KEY(`id`), FOREIGN KEY(`vault_id`) REFERENCES `vault`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` BLOB NOT NULL, `vault_id` BLOB NOT NULL, `name` TEXT NOT NULL, `note` TEXT, `item_type` TEXT NOT NULL, `pinned` INTEGER NOT NULL, `wrapped_key` BLOB NOT NULL, `key_nonce` BLOB NOT NULL, `created_at` INTEGER NOT NULL, `modified_at` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`vault_id`) REFERENCES `vault`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
         "fields": [
           {
             "fieldPath": "id",
@@ -102,6 +102,17 @@
             "columnName": "key_nonce",
             "affinity": "BLOB",
             "notNull": true
+          },
+          {
+            "fieldPath": "timestamp.createdAt",
+            "columnName": "created_at",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamp.modifiedAt",
+            "columnName": "modified_at",
+            "affinity": "INTEGER"
           }
         ],
         "primaryKey": {
@@ -597,7 +608,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'd827ca95e51c22ef1dc56c2eb260f41c')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '4f0b0d6a7ba5ff447e745fb0f08d8be3')"
     ]
   }
 }

core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/datasource/ItemDatabase.kt

@@ -72,7 +72,7 @@ internal class DatabaseModule {
         Room.databaseBuilder(
             context,
             ItemDatabase::class.java,
-            "secure_element_database",
+            "keygo_database",
         ).build()
 
     @Single

core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/entity/ItemEntity.kt

@@ -35,4 +35,5 @@ internal data class ItemEntity(
     val pinned: Boolean,
 
     @Embedded val keyInformation: KeyInformation,
+    @Embedded val timestamp: Timestamp,
 )

core/item/src/main/kotlin/de/davis/keygo/core/item/data/local/entity/Timestamp.kt

@@ -0,0 +1,10 @@
+package de.davis.keygo.core.item.data.local.entity
+
+import androidx.room.ColumnInfo
+
+internal data class Timestamp(
+    @ColumnInfo("created_at")
+    val createdAt: Long,
+    @ColumnInfo("modified_at")
+    val modifiedAt: Long?,
+)

core/item/src/main/kotlin/de/davis/keygo/core/item/data/mapper/CreditCardMapper.kt

@@ -18,6 +18,7 @@ internal fun CreditCardProjection.toDomain() = CreditCard(
     vaultId = item.itemEntity.vaultId,
     name = item.itemEntity.name,
     keyInformation = item.itemEntity.keyInformation.toDomain(),
+    timestamp = item.itemEntity.timestamp.toDomain(),
     tags = item.tags.map(TagEntity::toDomain).toSet(),
     note = item.itemEntity.note,
     pinned = item.itemEntity.pinned,

core/item/src/main/kotlin/de/davis/keygo/core/item/data/mapper/ItemMapper.kt

@@ -18,6 +18,7 @@ internal fun Item.toData() = ItemEntity(
     pinned = pinned,
 
     keyInformation = keyInformation.toEntity(),
+    timestamp = timestamp.toEntity(),
 )
 
 internal fun LightweightItem.toDomain() = LiteItem.Concrete(

core/item/src/main/kotlin/de/davis/keygo/core/item/data/mapper/LoginMapper.kt

@@ -41,6 +41,7 @@ internal fun LoginProjection.toDomain(): Login = Login(
     name = item.itemEntity.name,
     note = item.itemEntity.note,
     keyInformation = item.itemEntity.keyInformation.toDomain(),
+    timestamp = item.itemEntity.timestamp.toDomain(),
     tags = item.tags.map(TagEntity::toDomain).toSet(),
     pinned = item.itemEntity.pinned,
 )

core/item/src/main/kotlin/de/davis/keygo/core/item/data/mapper/TimestampMapper.kt

@@ -0,0 +1,15 @@
+package de.davis.keygo.core.item.data.mapper
+
+import de.davis.keygo.core.item.data.local.entity.Timestamp
+import kotlin.time.Instant
+import de.davis.keygo.core.item.domain.model.Timestamp as DomainTimestamp
+
+internal fun DomainTimestamp.toEntity(): Timestamp = Timestamp(
+    createdAt = createdAt.toEpochMilliseconds(),
+    modifiedAt = modifiedAt?.toEpochMilliseconds(),
+)
+
+internal fun Timestamp.toDomain(): DomainTimestamp = DomainTimestamp(
+    createdAt = Instant.fromEpochMilliseconds(createdAt),
+    modifiedAt = modifiedAt?.let { Instant.fromEpochMilliseconds(it) },
+)

core/item/src/main/kotlin/de/davis/keygo/core/item/data/repository/ItemTransactionRunnerImpl.kt

@@ -0,0 +1,15 @@
+package de.davis.keygo.core.item.data.repository
+
+import androidx.room.withTransaction
+import de.davis.keygo.core.item.data.local.datasource.ItemDatabase
+import de.davis.keygo.core.item.domain.repository.ItemTransactionRunner
+import org.koin.core.annotation.Single
+
+@Single
+internal class ItemTransactionRunnerImpl(
+    private val database: ItemDatabase,
+) : ItemTransactionRunner {
+
+    override suspend fun <R> inTransaction(block: suspend () -> R): R =
+        database.withTransaction { block() }
+}

core/item/src/main/kotlin/de/davis/keygo/core/item/domain/model/CreditCard.kt

@@ -12,6 +12,7 @@ data class CreditCard(
     override val vaultId: VaultId,
     override val name: String,
     override val keyInformation: KeyInformation,
+    override val timestamp: Timestamp,
     override val tags: Set<Tag>,
     override val note: String?,
     override val pinned: Boolean,

core/item/src/main/kotlin/de/davis/keygo/core/item/domain/model/Item.kt

@@ -13,4 +13,5 @@ sealed interface Item : LiteItem {
     val keyInformation: KeyInformation
     val tags: Set<Tag>
     val note: String?
+    val timestamp: Timestamp
 }

core/item/src/main/kotlin/de/davis/keygo/core/item/domain/model/Login.kt

@@ -17,6 +17,7 @@ data class Login(
     override val vaultId: VaultId,
     override val name: String,
     override val keyInformation: KeyInformation,
+    override val timestamp: Timestamp,
     override val tags: Set<Tag> = emptySet(),
     override val note: String?,
     override val pinned: Boolean,
@@ -27,7 +28,7 @@ data class Login(
 
     val hasAnyContent: Boolean
         get() = !username.isNullOrBlank()
-            || passwordCredential != null
-            || totp != null
-            || passkeyRPs.isNotEmpty()
+                || passwordCredential != null
+                || totp != null
+                || passkeyRPs.isNotEmpty()
 }

core/item/src/main/kotlin/de/davis/keygo/core/item/domain/model/Timestamp.kt

@@ -0,0 +1,9 @@
+package de.davis.keygo.core.item.domain.model
+
+import kotlin.time.Clock
+import kotlin.time.Instant
+
+data class Timestamp(
+    val createdAt: Instant = Clock.System.now(),
+    val modifiedAt: Instant? = null,
+)

core/item/src/main/kotlin/de/davis/keygo/core/item/domain/model/YearMonthExt.kt

@@ -0,0 +1,14 @@
+package de.davis.keygo.core.item.domain.model
+
+import java.time.YearMonth
+import java.time.format.DateTimeFormatter
+import java.time.format.DateTimeParseException
+
+// "yy" parses into the 2000-2099 range, which is correct for card expirations.
+private val EXPIRATION_FORMATTER: DateTimeFormatter = DateTimeFormatter.ofPattern("MM/yy")
+
+fun String.toYearMonthOrNull(): YearMonth? = try {
+    YearMonth.parse(this, EXPIRATION_FORMATTER)
+} catch (_: DateTimeParseException) {
+    null
+}

core/item/src/main/kotlin/de/davis/keygo/core/item/domain/repository/ItemTransactionRunner.kt

@@ -0,0 +1,14 @@
+package de.davis.keygo.core.item.domain.repository
+
+/**
+ * Runs a block of item writes as a single database transaction.
+ *
+ * Exists so callers outside `:core:item` can commit a batch atomically without reaching for
+ * `ItemDatabase`, which is internal to this module. Nesting is safe: Room's transaction support
+ * is reentrant on the same connection, so repository methods that already open their own
+ * transaction join the outer one rather than starting a second.
+ */
+interface ItemTransactionRunner {
+
+    suspend fun <R> inTransaction(block: suspend () -> R): R
+}

core/item/src/test/kotlin/de/davis/keygo/core/item/data/local/dao/ItemDaoSearchTest.kt

@@ -5,6 +5,7 @@ import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 import de.davis.keygo.core.item.data.local.datasource.ItemDatabase
 import de.davis.keygo.core.item.data.local.entity.ItemEntity
 import de.davis.keygo.core.item.data.local.entity.TagEntity
+import de.davis.keygo.core.item.data.local.entity.Timestamp
 import de.davis.keygo.core.item.data.local.entity.VaultEntity
 import de.davis.keygo.core.item.domain.alias.ItemId
 import de.davis.keygo.core.item.domain.alias.VaultId
@@ -67,6 +68,7 @@ internal class ItemDaoSearchTest {
                 itemType = VaultItemType.Login,
                 pinned = false,
                 keyInformation = EntityKeyInformation(byteArrayOf(), byteArrayOf()),
+                timestamp = Timestamp(createdAt = 0L, modifiedAt = null),
             )
         )
         if (tags.isNotEmpty())

core/item/src/test/kotlin/de/davis/keygo/core/item/data/local/dao/TagDaoTest.kt

@@ -5,6 +5,7 @@ import androidx.sqlite.driver.bundled.BundledSQLiteDriver
 import de.davis.keygo.core.item.data.local.datasource.ItemDatabase
 import de.davis.keygo.core.item.data.local.entity.ItemEntity
 import de.davis.keygo.core.item.data.local.entity.TagEntity
+import de.davis.keygo.core.item.data.local.entity.Timestamp
 import de.davis.keygo.core.item.data.local.entity.VaultEntity
 import de.davis.keygo.core.item.domain.alias.ItemId
 import de.davis.keygo.core.item.domain.alias.VaultId
@@ -64,6 +65,7 @@ internal class TagDaoTest {
                 itemType = VaultItemType.Login,
                 pinned = false,
                 keyInformation = EntityKeyInformation(byteArrayOf(), byteArrayOf()),
+                timestamp = Timestamp(createdAt = 0L, modifiedAt = null),
             )
         )
         return id

core/item/src/test/kotlin/de/davis/keygo/core/item/data/mapper/CreditCardMapperTest.kt

@@ -12,12 +12,14 @@ import de.davis.keygo.core.item.domain.model.CreditCard
 import de.davis.keygo.core.item.domain.model.EncryptedPayload
 import de.davis.keygo.core.item.domain.model.KeyInformation
 import de.davis.keygo.core.item.domain.model.Tag
+import de.davis.keygo.core.item.domain.model.Timestamp
 import de.davis.keygo.core.item.generated.domain.model.VaultItemType
 import java.time.YearMonth
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
 import de.davis.keygo.core.item.data.local.entity.KeyInformation as EntityKeyInformation
+import de.davis.keygo.core.item.data.local.entity.Timestamp as EntityTimestamp
 
 class CreditCardMapperTest {
 
@@ -128,6 +130,7 @@ class CreditCardMapperTest {
         cardNumber = cardNumber,
         cvv = cvv,
         expirationDate = expirationDate,
+        timestamp = Timestamp(),
     )
 
     private fun baseProjection(
@@ -157,6 +160,7 @@ class CreditCardMapperTest {
                     wrappedKey = byteArrayOf(),
                     keyNonce = byteArrayOf(),
                 ),
+                timestamp = EntityTimestamp(createdAt = 0L, modifiedAt = null),
             ),
             tags = tags,
         ),

core/item/src/test/kotlin/de/davis/keygo/core/item/data/mapper/DomainMapperTest.kt

@@ -10,6 +10,7 @@ import de.davis.keygo.core.item.domain.model.Login
 import de.davis.keygo.core.item.domain.model.PasswordCredential
 import de.davis.keygo.core.item.domain.model.PasswordScore
 import de.davis.keygo.core.item.domain.model.PasswordSecret
+import de.davis.keygo.core.item.domain.model.Timestamp
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
@@ -34,6 +35,7 @@ class DomainMapperTest {
         keyInformation = KeyInformation(wrappedKey = byteArrayOf(), keyNonce = byteArrayOf()),
         note = null,
         pinned = false,
+        timestamp = Timestamp(),
     )
 
     // toData

core/item/src/test/kotlin/de/davis/keygo/core/item/data/mapper/ItemMapperTest.kt

@@ -12,6 +12,7 @@ import de.davis.keygo.core.item.domain.model.Login
 import de.davis.keygo.core.item.domain.model.PasswordCredential
 import de.davis.keygo.core.item.domain.model.PasswordScore
 import de.davis.keygo.core.item.domain.model.PasswordSecret
+import de.davis.keygo.core.item.domain.model.Timestamp
 import de.davis.keygo.core.item.generated.domain.model.VaultItemType
 import kotlin.test.Test
 import kotlin.test.assertContentEquals
@@ -40,6 +41,7 @@ class ItemMapperTest {
         pinned = pinned,
         vaultId = newVaultId(),
         keyInformation = KeyInformation(byteArrayOf(), byteArrayOf()),
+        timestamp = Timestamp(),
     )
 
     // Item.toData() → ItemEntity

core/item/src/test/kotlin/de/davis/keygo/core/item/data/mapper/LoginMapperTest.kt

@@ -16,7 +16,9 @@ import de.davis.keygo.core.item.domain.model.PasswordCredential
 import de.davis.keygo.core.item.domain.model.PasswordScore
 import de.davis.keygo.core.item.domain.model.PasswordSecret
 import de.davis.keygo.core.item.domain.model.Tag
+import de.davis.keygo.core.item.domain.model.Timestamp
 import de.davis.keygo.core.item.generated.domain.model.VaultItemType
+import de.davis.keygo.core.item.data.local.entity.Timestamp as EntityTimestamp
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertNull
@@ -103,6 +105,7 @@ class LoginMapperTest {
                     wrappedKey = byteArrayOf(),
                     keyNonce = byteArrayOf(),
                 ),
+                timestamp = EntityTimestamp(createdAt = 0L, modifiedAt = null),
             ),
             tags = tags,
         ),
@@ -125,5 +128,6 @@ class LoginMapperTest {
         keyInformation = KeyInformation(byteArrayOf(), byteArrayOf()),
         note = null,
         pinned = false,
+        timestamp = Timestamp(),
     )
 }

core/item/src/test/kotlin/de/davis/keygo/core/item/data/repository/CreditCardRepositoryImplTest.kt

@@ -14,6 +14,7 @@ import de.davis.keygo.core.item.domain.alias.newVaultId
 import de.davis.keygo.core.item.domain.model.CreditCard
 import de.davis.keygo.core.item.domain.model.EncryptedPayload
 import de.davis.keygo.core.item.domain.model.KeyInformation
+import de.davis.keygo.core.item.domain.model.Timestamp
 import de.davis.keygo.core.item.generated.domain.model.VaultItemType
 import de.davis.keygo.core.util.isFailure
 import de.davis.keygo.core.util.isSuccess
@@ -34,6 +35,7 @@ import kotlin.test.assertEquals
 import kotlin.test.assertNull
 import kotlin.test.assertTrue
 import de.davis.keygo.core.item.data.local.entity.KeyInformation as EntityKeyInformation
+import de.davis.keygo.core.item.data.local.entity.Timestamp as EntityTimestamp
 
 class CreditCardRepositoryImplTest {
 
@@ -146,6 +148,7 @@ class CreditCardRepositoryImplTest {
         cardNumber = CreditCard.CardNumber(EncryptedPayload.EMPTY),
         cvv = CreditCard.CVV(EncryptedPayload.EMPTY),
         expirationDate = YearMonth.of(2030, 12),
+        timestamp = Timestamp(),
     )
 
     private fun projection(id: ItemId) = CreditCardProjection(
@@ -168,6 +171,7 @@ class CreditCardRepositoryImplTest {
                     wrappedKey = byteArrayOf(),
                     keyNonce = byteArrayOf(),
                 ),
+                timestamp = EntityTimestamp(createdAt = 0L, modifiedAt = null),
             ),
             tags = emptySet(),
         ),