feat(contacts): P1 шаг 2/2 — правка/удаление в UI (Room v4→5 href/etag/raw, форма, delete-подтверждение)

core/database/src/main/java/ru/forbion/f7cloud/core/database/ContactEntity.kt

@@ -24,4 +24,8 @@ data class ContactEntity(
     val birthday: String = "",
     val emails: String = "",
     val phones: String = "",
+    // Для безопасной правки/удаления (If-Match) и round-trip неизвестных полей vCard (P1).
+    val href: String = "",
+    val etag: String = "",
+    val raw: String = "",
 )

core/database/src/main/java/ru/forbion/f7cloud/core/database/ContactsDao.kt

@@ -36,6 +36,9 @@ interface ContactsDao {
     @Query("DELETE FROM contacts WHERE accountKey = :accountKey")
     suspend fun deleteAll(accountKey: String)
 
+    @Query("DELETE FROM contacts WHERE accountKey = :accountKey AND uid = :uid")
+    suspend fun deleteByUid(accountKey: String, uid: String)
+
     @Transaction
     suspend fun replaceAll(accountKey: String, contacts: List<ContactEntity>) {
         deleteAll(accountKey)

core/database/src/main/java/ru/forbion/f7cloud/core/database/F7Database.kt

@@ -9,7 +9,7 @@ import androidx.sqlite.db.SupportSQLiteDatabase
 
 @Database(
     entities = [FileEntity::class, ContactEntity::class],
-    version = 4,
+    version = 5,
     exportSchema = false,
 )
 abstract class F7Database : RoomDatabase() {
@@ -64,6 +64,15 @@ abstract class F7Database : RoomDatabase() {
             }
         }
 
+        // P1 Контакты (b-mob-contacts): href/etag/raw для правки/удаления (If-Match) и round-trip vCard.
+        private val MIGRATION_4_5 = object : Migration(4, 5) {
+            override fun migrate(db: SupportSQLiteDatabase) {
+                db.execSQL("ALTER TABLE contacts ADD COLUMN href TEXT NOT NULL DEFAULT ''")
+                db.execSQL("ALTER TABLE contacts ADD COLUMN etag TEXT NOT NULL DEFAULT ''")
+                db.execSQL("ALTER TABLE contacts ADD COLUMN raw TEXT NOT NULL DEFAULT ''")
+            }
+        }
+
         fun get(context: Context): F7Database {
             return INSTANCE ?: synchronized(this) {
                 INSTANCE ?: Room.databaseBuilder(
@@ -71,7 +80,7 @@ abstract class F7Database : RoomDatabase() {
                     F7Database::class.java,
                     "f7cloud-mobile.db",
                 )
-                    .addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4)
+                    .addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5)
                     .build()
                     .also { INSTANCE = it }
             }

core/network/detekt-baseline.xml

@@ -18,7 +18,7 @@
     <ID>NestedBlockDepth:CalDavClient.kt$CalDavClient$private fun parseCalendars(xml: String, baseUrl: String): List&lt;DavCalendar&gt;</ID>
     <ID>NestedBlockDepth:CalDavClient.kt$CalDavClient$private fun parseTrashResponses(xml: String, trashUrl: String): List&lt;DavTrashEvent&gt;</ID>
     <ID>NestedBlockDepth:CardDavClient.kt$CardDavClient$private fun parseAddressBooks(xml: String, baseUrl: String): List&lt;Pair&lt;String, String&gt;&gt;</ID>
-    <ID>NestedBlockDepth:CardDavClient.kt$CardDavClient$private fun parseContacts(xml: String, bookName: String): List&lt;DavContact&gt;</ID>
+    <ID>NestedBlockDepth:CardDavClient.kt$CardDavClient$private fun parseContacts(xml: String, bookName: String, bookUrl: String): List&lt;DavContact&gt;</ID>
     <ID>NestedBlockDepth:DavClient.kt$DavClient$private fun parseMultiStatus(xml: String, folderUrl: String): List&lt;DavEntry&gt;</ID>
     <ID>NoMultipleSpaces:CalendarIcs.kt$CalendarIcs$ </ID>
     <ID>PropertyWrapping:LoginFlowClient.kt$LoginFlowClient$private val REQUEST_TOKEN_REGEX = Regex("""name=["']requesttoken["']\s+value=["']([^"']+)["']""", RegexOption.IGNORE_CASE)</ID>

core/network/src/test/java/ru/forbion/f7cloud/core/network/VCardEditorTest.kt

@@ -28,7 +28,13 @@ class VCardEditorTest {
             append("TEL;TYPE=CELL:+70000000000\r\n")
             append("END:VCARD\r\n")
         }
-        val out = edit(raw, VCardFields(displayName = "Иван Петров", phones = listOf(VCardTypedValue("+79990001122", "WORK"))))
+        val out = edit(
+            raw,
+            VCardFields(
+                displayName = "Иван Петров",
+                phones = listOf(VCardTypedValue("+79990001122", "WORK")),
+            ),
+        )
         // UID и неизвестные свойства сохранены
         assertTrue("UID сохранён", out.contains("UID:abc-123"))
         assertTrue("PHOTO сохранён", out.contains("/9j/4AAQSkZJRgABAQAAAQABAAD"))