From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 6 Dec 2012 13:03:50 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/sync_review_2'
X-Git-Tag: oc-android-1.4.3~79
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f74e7ab11a864f0d2111801c65c9131d111ddae7?hp=279670c303c6b5e2c5a437b712e8d5ecf6f8b1a7

Merge remote-tracking branch 'origin/sync_review_2'
---

diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
index 151af4bc..271ea42e 100644
--- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java
@@ -164,6 +164,7 @@ public class SynchronizeFolderOperation extends RemoteOperation {
                     if (oldFile != null) {
                         file.setKeepInSync(oldFile.keepInSync());
                         file.setLastSyncDateForData(oldFile.getLastSyncDateForData());
+                        file.setModificationTimestampAtLastSyncForData(oldFile.getModificationTimestampAtLastSyncForData());    // not local, but must be kept unchanged when the file contents are not updated
                         checkAndFixForeignStoragePath(oldFile);
                         file.setStoragePath(oldFile.getStoragePath());
                     }