[Feature] Tag

app/build.gradle.kts

@@ -100,6 +100,7 @@ dependencies {
 
     implementation("com.google.android.gms:play-services-oss-licenses:17.0.1")
     implementation("com.google.code.gson:gson:2.10.1")
+    implementation("androidx.recyclerview:recyclerview:1.3.2")
     implementation("androidx.recyclerview:recyclerview-selection:1.1.0")
     implementation("androidx.navigation:navigation-fragment-ktx:2.7.4")
     implementation("androidx.navigation:navigation-ui-ktx:2.7.4")
@@ -120,15 +121,23 @@ dependencies {
     implementation("com.opencsv:opencsv:5.8")
 
     implementation("androidx.room:room-runtime:2.6.0")
+    implementation("androidx.room:room-ktx:2.6.0")
     ksp("androidx.room:room-compiler:2.6.0")
     implementation("androidx.room:room-rxjava3:2.6.0")
     androidTestImplementation("androidx.room:room-testing:2.6.0")
 
+    androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1")
+    implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2") //Used to convert flow to livedata -> TODO delete when migrated Dashboard to kotlin
+
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
 }
 
 room {
     schemaDirectory("$projectDir/schemas")
+}
+
+ksp {
+    arg("room.generateKotlin", "true")
 }

app/proguard-rules.pro

@@ -33,7 +33,10 @@
 -keep class com.google.gson.stream.** { *; }
 
 # Application classes that will be serialized/deserialized over Gson
--keep class de.davis.passwordmanager.security.element.** { <fields>; }
+-keep class * implements de.davis.passwordmanager.database.entities.details.ElementDetail{
+  *;
+}
+-keep class de.davis.passwordmanager.database.dtos.**
 
 # Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
 # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)

app/schemas/de.davis.passwordmanager.database.KeyGoDatabase/3.json

@@ -2,36 +2,29 @@
   "formatVersion": 1,
   "database": {
     "version": 3,
-    "identityHash": "59baef5dbb558a99b1e55c1f957119f0",
+    "identityHash": "0a97d13a94575bc2ed2ab009853b0086",
     "entities": [
       {
         "tableName": "SecureElement",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`data` BLOB, `title` TEXT, `type` INTEGER NOT NULL, `favorite` INTEGER NOT NULL DEFAULT false, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `created_at` INTEGER, `modified_at` INTEGER)",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`title` TEXT NOT NULL, `data` BLOB NOT NULL, `favorite` INTEGER NOT NULL, `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `type` INTEGER NOT NULL, `created_at` INTEGER DEFAULT CURRENT_TIMESTAMP, `modified_at` INTEGER)",
         "fields": [
-          {
-            "fieldPath": "detail",
-            "columnName": "data",
-            "affinity": "BLOB",
-            "notNull": false
-          },
           {
             "fieldPath": "title",
             "columnName": "title",
             "affinity": "TEXT",
-            "notNull": false
+            "notNull": true
           },
           {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "INTEGER",
+            "fieldPath": "detail",
+            "columnName": "data",
+            "affinity": "BLOB",
             "notNull": true
           },
           {
             "fieldPath": "favorite",
             "columnName": "favorite",
             "affinity": "INTEGER",
-            "notNull": true,
-            "defaultValue": "false"
+            "notNull": true
           },
           {
             "fieldPath": "id",
@@ -40,13 +33,20 @@
             "notNull": true
           },
           {
-            "fieldPath": "createdAt",
+            "fieldPath": "type",
+            "columnName": "type",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "timestamps.createdAt",
             "columnName": "created_at",
             "affinity": "INTEGER",
-            "notNull": false
+            "notNull": false,
+            "defaultValue": "CURRENT_TIMESTAMP"
           },
           {
-            "fieldPath": "modifiedAt",
+            "fieldPath": "timestamps.modifiedAt",
             "columnName": "modified_at",
             "affinity": "INTEGER",
             "notNull": false
@@ -60,12 +60,117 @@
         },
         "indices": [],
         "foreignKeys": []
+      },
+      {
+        "tableName": "Tag",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`name` TEXT NOT NULL, `tagId` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL)",
+        "fields": [
+          {
+            "fieldPath": "name",
+            "columnName": "name",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tagId",
+            "columnName": "tagId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": true,
+          "columnNames": [
+            "tagId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_Tag_name",
+            "unique": true,
+            "columnNames": [
+              "name"
+            ],
+            "orders": [],
+            "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_Tag_name` ON `${TABLE_NAME}` (`name`)"
+          }
+        ],
+        "foreignKeys": []
+      },
+      {
+        "tableName": "SecureElementTagCrossRef",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER NOT NULL, `tagId` INTEGER NOT NULL, PRIMARY KEY(`id`, `tagId`), FOREIGN KEY(`id`) REFERENCES `SecureElement`(`id`) ON UPDATE CASCADE ON DELETE CASCADE , FOREIGN KEY(`tagId`) REFERENCES `Tag`(`tagId`) ON UPDATE CASCADE ON DELETE CASCADE )",
+        "fields": [
+          {
+            "fieldPath": "id",
+            "columnName": "id",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "tagId",
+            "columnName": "tagId",
+            "affinity": "INTEGER",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "autoGenerate": false,
+          "columnNames": [
+            "id",
+            "tagId"
+          ]
+        },
+        "indices": [
+          {
+            "name": "index_SecureElementTagCrossRef_id",
+            "unique": false,
+            "columnNames": [
+              "id"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SecureElementTagCrossRef_id` ON `${TABLE_NAME}` (`id`)"
+          },
+          {
+            "name": "index_SecureElementTagCrossRef_tagId",
+            "unique": false,
+            "columnNames": [
+              "tagId"
+            ],
+            "orders": [],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_SecureElementTagCrossRef_tagId` ON `${TABLE_NAME}` (`tagId`)"
+          }
+        ],
+        "foreignKeys": [
+          {
+            "table": "SecureElement",
+            "onDelete": "CASCADE",
+            "onUpdate": "CASCADE",
+            "columns": [
+              "id"
+            ],
+            "referencedColumns": [
+              "id"
+            ]
+          },
+          {
+            "table": "Tag",
+            "onDelete": "CASCADE",
+            "onUpdate": "CASCADE",
+            "columns": [
+              "tagId"
+            ],
+            "referencedColumns": [
+              "tagId"
+            ]
+          }
+        ]
       }
     ],
     "views": [],
     "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, '59baef5dbb558a99b1e55c1f957119f0')"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '0a97d13a94575bc2ed2ab009853b0086')"
     ]
   }
 }

app/src/androidTest/java/de/davis/passwordmanager/database/DatabaseMigrationTest.kt

@@ -7,10 +7,11 @@ import androidx.room.testing.MigrationTestHelper
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry
 import de.davis.passwordmanager.database.converter.Converters
+import de.davis.passwordmanager.database.entities.details.password.PasswordDetails
+import de.davis.passwordmanager.database.entities.wrappers.CombinedElement
 import de.davis.passwordmanager.database.migration.MigrationSpec1To2
 import de.davis.passwordmanager.database.migration.MigrationSpec2To3
-import de.davis.passwordmanager.security.element.SecureElement
-import de.davis.passwordmanager.security.element.password.PasswordDetails
+import kotlinx.coroutines.test.runTest
 import org.junit.Assert.*
 import org.junit.Rule
 import org.junit.Test
@@ -39,14 +40,20 @@ class DatabaseMigrationTest {
 
     @Test
     @Throws(IOException::class)
-    fun testAllMigrations() {
+    fun testAllMigrations() = runTest {
         helper.createDatabase(TEST_DB, 1).apply {
             val contentValues = ContentValues().apply {
                 put("title", TITLE)
-                put("type", SecureElement.TYPE_PASSWORD)
+                put("type", ElementType.PASSWORD.typeId)
                 put(
                     "data",
-                    Converters.convertDetails(PasswordDetails(PASSWORD, ORIGIN, USERNAME))
+                    Converters.convertDetails(
+                        PasswordDetails(
+                            PASSWORD,
+                            ORIGIN,
+                            USERNAME
+                        )
+                    )
                 )
             }
             insert("SecureElement", SQLiteDatabase.CONFLICT_REPLACE, contentValues)
@@ -58,12 +65,12 @@ class DatabaseMigrationTest {
             TEST_DB
         ).build().apply {
             openHelper.writableDatabase
-            val element: SecureElement = secureElementDao().getById(1)
-            element.run {
+            val element: CombinedElement = combinedDao().getCombinedElement().first()
+            element.secureElementEntity.run {
                 assertEquals(TITLE, title)
-                assertFalse(isFavorite)
-                assertNull(modifiedAt)
-                assertNotNull(createdAt)
+                assertFalse(favorite)
+                assertNull(timestamps.modifiedAt)
+                assertNotNull(timestamps.createdAt)
                 (detail as PasswordDetails).run {
                     assertEquals(PASSWORD, password)
                     assertEquals(ORIGIN, origin)