Skip to content

Preserve original file extension in WebDAV temporary files #3207

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

Open
jim-kirisame wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Preserve original file extension in WebDAV temporary files #3207

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions ...java/JavaFileStorage/app/src/main/java/keepass2android/javafilestorage/WebDavStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,9 +389,24 @@ public void uploadFile(String path, byte[] data, boolean writeTransactional)

if (writeTransactional)
{
String randomSuffix = ".tmp." + generateRandomHexString(8);
uploadFile(path + randomSuffix, data, false);
renameOrMoveWebDavResource(path+randomSuffix, path, true);
// Generate a unique temporary file suffix
String tempSuffix = ".tmp." + generateRandomHexString(8);
String tempPath;

// Preserve the original file extension for WebDAV providers that don't support
// changing extensions. Insert temp suffix before the extension instead of after it.
// Example: "file.kdbx" -> "file.tmp.abc12345.kdbx" (instead of "file.kdbx.tmp.abc12345")
int lastDot = path.lastIndexOf('.');
int lastSlash = path.lastIndexOf('/');
if (lastDot > lastSlash && lastDot >= 0) {
// File has an extension: insert temp suffix before the extension
tempPath = path.substring(0, lastDot) + tempSuffix + path.substring(lastDot);
} else {
// No extension: append temp suffix at the end
tempPath = path + tempSuffix;
}
uploadFile(tempPath, data, false);
renameOrMoveWebDavResource(tempPath, path, true);
return;
}

Expand Down