X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/e35e32ad52f3964a44f0f404adf699e0d18502de..aaa8939b801ad30f5943128b9f17783b5be859b3:/src/com/owncloud/android/operations/UploadFileOperation.java diff --git a/src/com/owncloud/android/operations/UploadFileOperation.java b/src/com/owncloud/android/operations/UploadFileOperation.java index a347192b..1b4aced5 100644 --- a/src/com/owncloud/android/operations/UploadFileOperation.java +++ b/src/com/owncloud/android/operations/UploadFileOperation.java @@ -332,7 +332,9 @@ public class UploadFileOperation extends RemoteOperation { if (result.isSuccess()) { if (mLocalBehaviour == FileUploader.LOCAL_BEHAVIOUR_FORGET) { mFile.setStoragePath(null); - + } else if (mLocalBehaviour == FileUploader.LOCAL_BEHAVIOUR_REMOVE){ + mFile.setStoragePath(null); + originalFile.delete(); } else { mFile.setStoragePath(expectedPath); File fileToMove = null; @@ -359,10 +361,9 @@ public class UploadFileOperation extends RemoteOperation { // return result; } } - FileDataStorageManager.triggerMediaScan(originalFile.getAbsolutePath()); - FileDataStorageManager.triggerMediaScan(expectedFile.getAbsolutePath()); } - + FileDataStorageManager.triggerMediaScan(originalFile.getAbsolutePath()); + FileDataStorageManager.triggerMediaScan(expectedFile.getAbsolutePath()); } else if (result.getHttpCode() == HttpStatus.SC_PRECONDITION_FAILED ) { result = new RemoteOperationResult(ResultCode.SYNC_CONFLICT); }