BUG：目前已经能够成功构建、云端备份会闪退、待修复

Author: Fastace

source/core/service/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.library.hilt)
     alias(libs.plugins.library.protobuf)
     alias(libs.plugins.refine)
+    alias(libs.plugins.kotlin.serialization)  // 添加这行
 }
 
 android {
@@ -22,6 +23,8 @@ dependencies {
     implementation(project(":core:restic"))
     compileOnly(project(":core:hiddenapi"))
 
+    // JSON Serialization - 添加这个依赖
+    implementation(libs.kotlinx.serialization.json)
 
     // Gson
     implementation(libs.gson)

source/core/service/src/main/kotlin/com/xayah/core/service/packages/backup/BackupServiceCloudImpl.kt

@@ -2,7 +2,7 @@ package com.xayah.core.service.packages.backup
 
 import android.util.Log
 import com.xayah.core.restic.ResticRepository
-import com.xayah.core.restic.ResticProgressCallback  // 添加
+import com.xayah.core.restic.ResticRepository.ResticProgressCallback   // 添加
 import com.xayah.core.restic.ResticSnapshot  // 添加
 import com.xayah.core.model.util.formatToStorageSizePerSecond
 import com.xayah.core.data.repository.CloudRepository
@@ -15,7 +15,7 @@ import com.xayah.core.model.OpType
 import com.xayah.core.model.OperationState
 import com.xayah.core.model.TaskType
 import com.xayah.core.model.database.CloudEntity
-import com.xayah.core.model.database.CloudType  // 添加
+import com.xayah.core.model.CloudType  // 添加
 import com.xayah.core.model.database.PackageEntity
 import com.xayah.core.model.database.ProcessingInfoEntity
 import com.xayah.core.model.database.TaskDetailPackageEntity
@@ -120,7 +120,7 @@ internal class BackupServiceCloudImpl @Inject constructor() : AbstractBackupServ
                 when (mCloudEntity.type) {
                     CloudType.S3 -> {
                         // S3 使用 Restic 备份
-                        val s3Extra = Json.decodeFromString<S3Extra>(mCloudEntity.extra)
+                        val s3Extra = json.decodeFromString<S3Extra>(mCloudEntity.extra)
                         val resticSuccess = backupWithResticToS3(
                             packageName = p.packageName,
                             compressedFile = compressedFile,
@@ -184,6 +184,8 @@ internal class BackupServiceCloudImpl @Inject constructor() : AbstractBackupServ
         t.update(processingIndex = t.processingIndex + 1)
     }
 
+    private val json = Json { ignoreUnknownKeys = true }
+
     /**
      * 使用 Restic 备份到 S3
      */
@@ -247,7 +249,7 @@ internal class BackupServiceCloudImpl @Inject constructor() : AbstractBackupServ
      */
     private fun extractSnapshotIdFromJson(jsonOutput: String): String? {
         return try {
-            Json.decodeFromString<ResticSnapshot>(jsonOutput).id
+            json.decodeFromString<ResticSnapshot>(jsonOutput).id
         } catch (e: Exception) {
             null
         }

source/gradle/libs.versions.toml

@@ -49,7 +49,7 @@ guava-compat = "9999.0-empty-to-avoid-conflict-with-guava"
 sardine-next = "1.0.2"
 bountycastle = "1.79"
 animation-graphics = "1.7.6"
-
+kotlinxSerializationJson = "1.6.0"
 # plugins
 android-gradle-plugin = "8.11.1"
 kotlin = "2.0.21"
@@ -129,6 +129,7 @@ firebase-crashlytics-build-logic = { group = "com.google.firebase", name = "fire
 [plugins]
 android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
+kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } # https://androidx.dev/storage/compose-compiler/repository
 kapt = { id = "org.jetbrains.kotlin.kapt", version.ref = "kotlin" }
 serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }