@@ -845,7 +845,7 @@ private void updateMetadataForV2(DecryptedFolderMetadataFile metadata, Encryptio
845
845
846
846
private void completeE2EUpload (RemoteOperationResult result , E2EFiles e2eFiles , OwnCloudClient client ) {
847
847
if (result .isSuccess ()) {
848
- handleSuccessfulUpload (e2eFiles .getTemporalFile (), e2eFiles .getExpectedFile (), e2eFiles .getOriginalFile (), client );
848
+ handleLocalBehaviour (e2eFiles .getTemporalFile (), e2eFiles .getExpectedFile (), e2eFiles .getOriginalFile (), client );
849
849
} else if (result .getCode () == ResultCode .SYNC_CONFLICT ) {
850
850
getStorageManager ().saveConflict (mFile , mFile .getEtagInConflict ());
851
851
}
@@ -1098,7 +1098,7 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
1098
1098
}
1099
1099
1100
1100
if (result .isSuccess ()) {
1101
- handleSuccessfulUpload (temporalFile , expectedFile , originalFile , client );
1101
+ handleLocalBehaviour (temporalFile , expectedFile , originalFile , client );
1102
1102
} else if (result .getCode () == ResultCode .SYNC_CONFLICT ) {
1103
1103
getStorageManager ().saveConflict (mFile , mFile .getEtagInConflict ());
1104
1104
}
@@ -1197,10 +1197,20 @@ private RemoteOperationResult checkNameCollision(OCFile parentFile,
1197
1197
return null ;
1198
1198
}
1199
1199
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 ) {
1204
1214
switch (mLocalBehaviour ) {
1205
1215
case FileUploadWorker .LOCAL_BEHAVIOUR_FORGET :
1206
1216
default :
0 commit comments