BUG标记:备份流程在 ResticBackupUtil.backupWithRestic() 方法中仍然卡住，没有看到任何 ResticBackupUtil 或 ResticExecutor 的调试日志输出

Author: Fastace

source/core/service/src/main/kotlin/com/xayah/core/service/util/PackagesBackupUtil.kt

@@ -236,13 +236,16 @@ class PackagesBackupUtil @Inject constructor(
             return BackupResult.failed("Failed to get apk path of $packageName")
         }
 
-        // val resticUtil = ResticBackupUtil(context) // REMOVED local instantiation
-        return resticUtil.backupWithRestic( // USED injected resticUtil
-            sourcePath = srcDir,  // 使用 srcDir 而不是 apkPath
+        // 添加调试日志
+        log { "About to call resticUtil.backupWithRestic()" }
+        log { "resticUtil is null: ${resticUtil == null}" }
+        log { "Source directory: $srcDir" }
+
+        val result = resticUtil.backupWithRestic(
+            sourcePath = srcDir,
             localRepoPath = getLocalResticRepoPath(),
             password = getResticPassword(),
             onProgress = { progress: Float ->
-                // 修复点: 移除同步调用，使用 launch 启动非阻塞更新 (257行)
                 currentScope.launch {
                     t.updateInfo(dataType = DataType.PACKAGE_APK, bytes = (progress * 100).toLong())
                 }
@@ -253,8 +256,10 @@ class PackagesBackupUtil @Inject constructor(
                 }
             }
         )
-    }
 
+        log { "resticUtil.backupWithRestic() completed with result: $result" }
+        return result
+    }
     /**
      * Package data: USER, USER_DE, DATA, OBB, MEDIA
      */

source/core/service/src/main/kotlin/com/xayah/core/service/util/ResticBackupUtil.kt

@@ -1,6 +1,7 @@
 package com.xayah.core.service.util
 
 import android.content.Context
+import android.util.Log
 import dagger.hilt.android.qualifiers.ApplicationContext
 import javax.inject.Inject
 import java.util.concurrent.CompletableFuture
@@ -13,34 +14,24 @@ import com.xayah.core.common.restic.ResticInitializationProvider  // 使用接
 
 class ResticBackupUtil @Inject constructor(
     @ApplicationContext private val context: Context,
-    private val resticInitializationProvider: ResticInitializationProvider  // 注入接口
+    private val resticExecutor: ResticExecutor  // 注入接口
 ) {
-    private val resticExecutor = ResticExecutor(context)
-
     suspend fun backupWithRestic(
         sourcePath: String,
         localRepoPath: String,
         password: String,
         onProgress: (Float) -> Unit,
         onCancel: (() -> Unit)? = null
     ): BackupResult {
-        // 使用注入的接口检查初始化状态
-        if (!resticInitializationProvider.isResticInitialized) {
-            val initialized = resticInitializationProvider.waitForResticInitialization()
-            if (!initialized) {
-                return BackupResult.failed("Restic initialization timeout")
-            }
-        }
+        Log.d("ResticBackupUtil", "Starting backupWithRestic")
+        Log.d("ResticBackupUtil", "Source path: $sourcePath")
+        Log.d("ResticBackupUtil", "Local repo path: $localRepoPath")
 
-        // 创建一个 CompletableFuture 作为取消信号
         val cancelFuture = CompletableFuture<Unit>()
-
-        // 如果提供了取消回调，将其绑定到 cancelFuture 的完成事件
-        onCancel?.let {
-            cancelFuture.thenRun { it() }
-        }
+        Log.d("ResticBackupUtil", "Created cancelFuture")
 
         return try {
+            Log.d("ResticBackupUtil", "Calling resticExecutor.executeBackup()")
             val summary = resticExecutor.executeBackup(
                 repoPath = localRepoPath,
                 password = password,

source/core/service/src/main/kotlin/com/xayah/core/service/util/ResticExecutor.kt

@@ -3,6 +3,8 @@ package com.xayah.core.service.util
 import android.content.Context
 import android.util.Log
 import android.os.Build
+import dagger.hilt.android.qualifiers.ApplicationContext
+import javax.inject.Inject
 import java.io.File
 import java.io.InputStream
 import java.nio.charset.Charset
@@ -15,7 +17,13 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.decodeFromString
 import com.xayah.core.common.restic.ResticBinaryManager
 
-class ResticExecutor(private val context: Context) {
+class ResticExecutor @Inject constructor (
+    @ApplicationContext private val context: Context
+) {
+    companion object {
+        private const val TAG = "ResticExecutor"
+    }
+
     private val jsonFormat = Json { ignoreUnknownKeys = true }
     private val storageDir = File(context.filesDir, "restic")
     private val binaryManager = ResticBinaryManager(context)
@@ -100,6 +108,10 @@ class ResticExecutor(private val context: Context) {
                 "--json"
             )
 
+            Log.d(TAG, "Starting backup with command: $command")
+            Log.d(TAG, "Working directory: ${storageDir.absolutePath}")
+            Log.d(TAG, "Repository: $repoPath")
+
             val process = executeCommandWithPasswordFile(command, password)
             var summary: ResticBackupSummary? = null