Fixed lock of buttons in details view when the 'Keep both' option in conflicts dialog...

[pub/Android/ownCloud.git] / src / com / owncloud / android / operations / RenameFileOperation.java

diff --git a/src/com/owncloud/android/operations/RenameFileOperation.java b/src/com/owncloud/android/operations/RenameFileOperation.java
index 709eda2..483a312 100644 (file)
--- a/src/com/owncloud/android/operations/RenameFileOperation.java
+++ b/src/com/owncloud/android/operations/RenameFileOperation.java
@@ -28,8 +28,8 @@ import android.util.Log;
 
 import com.owncloud.android.datamodel.DataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
-import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;
+import com.owncloud.android.utils.FileStorageUtils;
 
 import eu.alefzero.webdav.WebdavClient;
 import eu.alefzero.webdav.WebdavUtils;
@@ -163,7 +163,7 @@ public class RenameFileOperation extends RemoteOperation {
             return false;
         }
         // create a test file
-        String tmpFolder = FileDownloader.getTemporalPath("");
+        String tmpFolder = FileStorageUtils.getTemporalPath("");
         File testFile = new File(tmpFolder + mNewName);
         try {
             testFile.createNewFile();   // return value is ignored; it could be 'false' because the file already existed, that doesn't invalidate the name
@@ -191,7 +191,8 @@ public class RenameFileOperation extends RemoteOperation {
         file.setFileId(mFile.getFileId());
         file.setFileLength(mFile.getFileLength());
         file.setKeepInSync(mFile.keepInSync());
-        file.setLastSyncDate(mFile.getLastSyncDate());
+        file.setLastSyncDateForProperties(mFile.getLastSyncDateForProperties());
+        file.setLastSyncDateForData(mFile.getLastSyncDateForData());
         file.setMimetype(mFile.getMimetype());
         file.setModificationTimestamp(mFile.getModificationTimestamp());
         file.setParentId(mFile.getParentId());