Merge pull request #1064 from synonymdev/fix/backup-wallet-id-migration

fix: migrate legacy backups missing wallet id on restore

Author: piotr-iohk

app/src/main/java/to/bitkit/repositories/BackupRepo.kt

@@ -1,6 +1,9 @@
 package to.bitkit.repositories
 
 import android.content.Context
+import com.synonym.bitkitcore.migrateBackupActivitiesJson
+import com.synonym.bitkitcore.migrateBackupActivityTagsJson
+import com.synonym.bitkitcore.migrateBackupPreActivityMetadataJson
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
@@ -26,6 +29,9 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import kotlinx.coroutines.withTimeout
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonArray
+import kotlinx.serialization.json.JsonObject
+import kotlinx.serialization.json.jsonObject
 import to.bitkit.R
 import to.bitkit.data.AppDb
 import to.bitkit.data.CacheStore
@@ -558,7 +564,11 @@ class BackupRepo @Inject constructor(
 
         val result = runCatching {
             performRestore(BackupCategory.METADATA) { dataBytes ->
-                val parsed = json.decodeFromString<MetadataBackupV1>(String(dataBytes))
+                val migrated = migrateCoreOwnedBackupFields(
+                    String(dataBytes),
+                    mapOf("tagMetadata" to ::migrateBackupPreActivityMetadataJson),
+                )
+                val parsed = json.decodeFromString<MetadataBackupV1>(migrated)
                 val cleanCache = parsed.cache.resetBip21() // Force address rotation
                 cacheStore.update { cleanCache }
                 Logger.debug("Restored caches: ${jsonLogOf(parsed.cache.copy(cachedRates = emptyList()))}", TAG)
@@ -594,7 +604,14 @@ class BackupRepo @Inject constructor(
                 parsed.createdAt
             }
             performRestore(BackupCategory.ACTIVITY) { dataBytes ->
-                val parsed = json.decodeFromString<ActivityBackupV1>(String(dataBytes))
+                val migrated = migrateCoreOwnedBackupFields(
+                    String(dataBytes),
+                    mapOf(
+                        "activities" to ::migrateBackupActivitiesJson,
+                        "activityTags" to ::migrateBackupActivityTagsJson,
+                    ),
+                )
+                val parsed = json.decodeFromString<ActivityBackupV1>(migrated)
                 activityRepo.restoreFromBackup(parsed)
                 parsed.createdAt
             }
@@ -668,6 +685,28 @@ class BackupRepo @Inject constructor(
             }
     }
 
+    /**
+     * Fill in wallet ids that predate wallet-scoped activity data before a backup
+     * envelope is decoded. Each Core-owned array field is handed to the matching
+     * Core migration helper as raw JSON, so the app never edits Core model JSON
+     * itself. Records that already carry a wallet id are left unchanged, so this
+     * is safe to run on current backups too.
+     */
+    private fun migrateCoreOwnedBackupFields(
+        raw: String,
+        fieldMigrations: Map<String, (String) -> String>,
+    ): String {
+        val root = json.parseToJsonElement(raw).jsonObject
+        val patched = root.toMutableMap()
+        for ((field, migrate) in fieldMigrations) {
+            val element = root[field]
+            if (element is JsonArray) {
+                patched[field] = json.parseToJsonElement(migrate(element.toString()))
+            }
+        }
+        return JsonObject(patched).toString()
+    }
+
     private suspend fun performRestore(
         category: BackupCategory,
         restoreAction: suspend (dataBytes: ByteArray) -> Long,

gradle/libs.versions.toml

@@ -21,7 +21,7 @@ activity-compose = { module = "androidx.activity:activity-compose", version = "1
 appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
 barcode-scanning = { module = "com.google.mlkit:barcode-scanning", version = "17.3.0" }
 biometric = { module = "androidx.biometric:biometric", version = "1.4.0-alpha05" }
-bitkit-core = { module = "com.synonym:bitkit-core-android", version = "0.3.9" }
+bitkit-core = { module = "com.synonym:bitkit-core-android", version = "0.4.0" }
 paykit = { module = "com.synonym:paykit-android", version = "0.1.0-rc31" }
 bouncycastle-provider-jdk = { module = "org.bouncycastle:bcprov-jdk18on", version = "1.83" }
 camera-camera2 = { module = "androidx.camera:camera-camera2", version.ref = "camera" }