Skip to content

Bugfix - E2EE Copy, Lock, Unlock File #14800

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

Closed
alperozturk96 wants to merge 5 commits into from
Closed

Bugfix - E2EE Copy, Lock, Unlock File #14800

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8f9f5d
use apache utils for copy
alperozturk96 Apr 16, 2025
149cad2
fix
alperozturk96 Apr 16, 2025
20883cd
fix code analytics
alperozturk96 Apr 16, 2025
29d3f0d
use better errors
alperozturk96 Apr 16, 2025
3618923
handle some cases
alperozturk96 Apr 16, 2025
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
Prev Previous commit
Next Next commit
use better errors 
Signed-off-by: alperozturk <[email protected]>
  • Loading branch information
@alperozturk96
alperozturk96 committed Apr 16, 2025
commit 29d3f0db3f5a5d63b95f9d8d59d11beb3093907a
6 changes: 3 additions & 3 deletions app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ private RemoteOperationResult encryptedUpload(OwnCloudClient client, OCFile pare

final var copyResult = copyFile(e2eFiles.getOriginalFile(), expectedPath);
if (!copyResult) {
return new RemoteOperationResult<>(ResultCode.LOCK_FAILED);
return new RemoteOperationResult<>(ResultCode.LOCAL_STORAGE_NOT_COPIED);
}

result = new RemoteOperationResult<>(ResultCode.OK);
Expand Down Expand Up @@ -980,7 +980,7 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
if (copyResult) {
result = new RemoteOperationResult<>(ResultCode.OK);
} else {
return new RemoteOperationResult<>(ResultCode.LOCK_FAILED);
return new RemoteOperationResult<>(ResultCode.LOCAL_STORAGE_NOT_COPIED);
}

// Get the last modification date of the file from the file system
Expand Down Expand Up @@ -1011,7 +1011,7 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
result = new RemoteOperationResult<>(ResultCode.LOCK_FAILED);
}
} else {
result = new RemoteOperationResult<>(ResultCode.LOCK_FAILED);
result = new RemoteOperationResult<>(ResultCode.LOCAL_STORAGE_NOT_COPIED);
}
}

Expand Down
Loading