From: David A. Velasco Date: Thu, 16 Oct 2014 11:11:32 +0000 (+0200) Subject: Fix lost update of remoteId when file is sync'ed after being replaced in server by... X-Git-Tag: oc-android-1.7.0_signed~15^2~13 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fe2f7ce8a6588daeb4139b0cbbc8152f2debdaca?ds=inline;hp=--cc Fix lost update of remoteId when file is sync'ed after being replaced in server by other one --- fe2f7ce8a6588daeb4139b0cbbc8152f2debdaca diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index cb0f12ce..fdc35f8d 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -398,6 +398,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis file.setMimetype(mCurrentDownload.getMimeType()); file.setStoragePath(mCurrentDownload.getSavePath()); file.setFileLength((new File(mCurrentDownload.getSavePath()).length())); + file.setRemoteId(mCurrentDownload.getFile().getRemoteId()); mStorageManager.saveFile(file); } diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java index c8ee1e2c..45a73057 100644 --- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java @@ -170,6 +170,8 @@ public class SynchronizeFileOperation extends SyncOperation { result = new RemoteOperationResult(ResultCode.OK); } else if (serverChanged) { + mLocalFile.setRemoteId(mServerFile.getRemoteId()); + if (mSyncFileContents) { requestForDownload(mLocalFile); // local, not server; we won't to keep the value of keepInSync! // the update of local data will be done later by the FileUploader service when the upload finishes