Merge pull request #2348 from nextcloud/modTimestamp

Use modification date from server

src/main/java/com/owncloud/android/operations/DownloadFileOperation.java

@@ -212,6 +212,7 @@ public class DownloadFileOperation extends RemoteOperation {
                 }
             }
             moved = tmpFile.renameTo(newFile);
+            newFile.setLastModified(mFile.getModificationTimestamp());
             if (!moved) {
                 result = new RemoteOperationResult(RemoteOperationResult.ResultCode.LOCAL_STORAGE_NOT_MOVED);
             }

src/main/java/com/owncloud/android/utils/FileStorageUtils.java

@@ -338,13 +338,16 @@ public class FileStorageUtils {
         long lastModified = 0;
         long lastSize = 0;
         File realFile = new File(file.getStoragePath());
-        while ((realFile.lastModified() != lastModified) && (realFile.length() != lastSize)) {
-            lastModified = realFile.lastModified();
-            lastSize = realFile.length();
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                Log.d(TAG, "Failed to sleep for a bit");
+
+        if (realFile.lastModified() != file.getModificationTimestamp() && realFile.length() != file.getFileLength()) {
+            while ((realFile.lastModified() != lastModified) && (realFile.length() != lastSize)) {
+                lastModified = realFile.lastModified();
+                lastSize = realFile.length();
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    Log.d(TAG, "Failed to sleep for a bit");
+                }
             }
         }