Skip to content

Commit b3981bd

Browse files
committed
handleLocalBehaviour
Signed-off-by: alperozturk <[email protected]>
1 parent ab190f5 commit b3981bd

File tree

2 files changed

+17
-6
lines changed

2 files changed

+17
-6
lines changed

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,7 @@ class FileUploadWorker(
282282
context
283283
)
284284
) {
285+
uploadFileOperation.handleLocalBehaviour()
285286
return
286287
}
287288

app/src/main/java/com/owncloud/android/operations/UploadFileOperation.java

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -845,7 +845,7 @@ private void updateMetadataForV2(DecryptedFolderMetadataFile metadata, Encryptio
845845

846846
private void completeE2EUpload(RemoteOperationResult result, E2EFiles e2eFiles, OwnCloudClient client) {
847847
if (result.isSuccess()) {
848-
handleSuccessfulUpload(e2eFiles.getTemporalFile(), e2eFiles.getExpectedFile(), e2eFiles.getOriginalFile(), client);
848+
handleLocalBehaviour(e2eFiles.getTemporalFile(), e2eFiles.getExpectedFile(), e2eFiles.getOriginalFile(), client);
849849
} else if (result.getCode() == ResultCode.SYNC_CONFLICT) {
850850
getStorageManager().saveConflict(mFile, mFile.getEtagInConflict());
851851
}
@@ -1098,7 +1098,7 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
10981098
}
10991099

11001100
if (result.isSuccess()) {
1101-
handleSuccessfulUpload(temporalFile, expectedFile, originalFile, client);
1101+
handleLocalBehaviour(temporalFile, expectedFile, originalFile, client);
11021102
} else if (result.getCode() == ResultCode.SYNC_CONFLICT) {
11031103
getStorageManager().saveConflict(mFile, mFile.getEtagInConflict());
11041104
}
@@ -1197,10 +1197,20 @@ private RemoteOperationResult checkNameCollision(OCFile parentFile,
11971197
return null;
11981198
}
11991199

1200-
private void handleSuccessfulUpload(File temporalFile,
1201-
File expectedFile,
1202-
File originalFile,
1203-
OwnCloudClient client) {
1200+
public void handleLocalBehaviour() {
1201+
String expectedPath = FileStorageUtils.getDefaultSavePathFor(user.getAccountName(), mFile);
1202+
File expectedFile = new File(expectedPath);
1203+
File originalFile = new File(mOriginalStoragePath);
1204+
String temporalPath = FileStorageUtils.getInternalTemporalPath(user.getAccountName(), mContext) + mFile.getRemotePath();
1205+
File temporalFile = new File(temporalPath);
1206+
1207+
handleLocalBehaviour(temporalFile, expectedFile, originalFile, getClient());
1208+
}
1209+
1210+
private void handleLocalBehaviour(File temporalFile,
1211+
File expectedFile,
1212+
File originalFile,
1213+
OwnCloudClient client) {
12041214
switch (mLocalBehaviour) {
12051215
case FileUploadWorker.LOCAL_BEHAVIOUR_FORGET:
12061216
default:

0 commit comments

Comments
 (0)