Skip to content

Commit cf3e6d1

Browse files
authored
Merge pull request #27 from qisumi/main
fix: 修复加密备份上传后文件名丢失.enc 标识的问题
2 parents ba6f963 + b071d51 commit cf3e6d1

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

Monica for Android/app/src/main/java/takagi/ru/monica/utils/WebDavHelper.kt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3525,10 +3525,16 @@ class WebDavHelper(
35253525
sardine!!.createDirectory(backupDir)
35263526
}
35273527

3528-
// 生成带时间戳的文件名
3528+
// 生成带时间戳的文件名,保留加密标识
35293529
val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
35303530
val suffix = if (isPermanent) PERMANENT_SUFFIX else ""
3531-
val fileName = "monica_backup_$timestamp$suffix.zip"
3531+
// 根据源文件名判断是否加密,保留 .enc.zip 后缀
3532+
val isEncrypted = file.name.endsWith(".enc.zip")
3533+
val fileName = if (isEncrypted) {
3534+
"monica_backup_$timestamp$suffix.enc.zip"
3535+
} else {
3536+
"monica_backup_$timestamp$suffix.zip"
3537+
}
35323538
val remotePath = "$backupDir/$fileName"
35333539

35343540
// 使用流式上传避免内存溢出

0 commit comments

Comments
 (0)