Skip to content

fix: 修复加密备份上传后文件名丢失.enc 标识的问题 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JoyinJoester merged 2 commits into from
Mar 13, 2026
Merged

fix: 修复加密备份上传后文件名丢失.enc 标识的问题 #27

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdb2fb0
fix: 修复加密备份上传后文件名丢失.enc 标识的问题
qisumi Mar 13, 2026
b071d51
Merge pull request #1 from qisumi/fix/webdav-encrypted-backup-filename
qisumi Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions Monica for Android/app/src/main/java/takagi/ru/monica/utils/WebDavHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3525,10 +3525,16 @@ class WebDavHelper(
sardine!!.createDirectory(backupDir)
}

// 生成带时间戳的文件名
// 生成带时间戳的文件名，保留加密标识
val timestamp = SimpleDateFormat("yyyyMMdd_HHmmss", Locale.getDefault()).format(Date())
val suffix = if (isPermanent) PERMANENT_SUFFIX else ""
val fileName = "monica_backup_$timestamp$suffix.zip"
// 根据源文件名判断是否加密，保留 .enc.zip 后缀
val isEncrypted = file.name.endsWith(".enc.zip")
val fileName = if (isEncrypted) {
"monica_backup_$timestamp$suffix.enc.zip"
} else {
"monica_backup_$timestamp$suffix.zip"
}
val remotePath = "$backupDir/$fileName"

// 使用流式上传避免内存溢出
Expand Down
Loading