Enforced check of local modification date when synchronizing file contents to avoid...

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

diff --git a/src/com/owncloud/android/operations/SynchronizeFileOperation.java b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
index f02241e..b5f6575 100644 (file)
--- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java
+++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java
@@ -49,7 +49,6 @@ public class SynchronizeFileOperation extends RemoteOperation {
     private FileDataStorageManager mStorageManager;
     private Account mAccount;
     private boolean mSyncFileContents;
     private FileDataStorageManager mStorageManager;
     private Account mAccount;
     private boolean mSyncFileContents;

-    private boolean mLocalChangeAlreadyKnown;

     private Context mContext;
     
     private boolean mTransferWasRequested = false;
     private Context mContext;
     
     private boolean mTransferWasRequested = false;


@@ -60,7 +59,6 @@ public class SynchronizeFileOperation extends RemoteOperation {
             FileDataStorageManager storageManager, 
             Account account, 
             boolean syncFileContents,
             FileDataStorageManager storageManager, 
             Account account, 
             boolean syncFileContents,

-            boolean localChangeAlreadyKnown, 

             Context context) {
         
         mLocalFile = localFile;
             Context context) {
         
         mLocalFile = localFile;


@@ -68,7 +66,6 @@ public class SynchronizeFileOperation extends RemoteOperation {
         mStorageManager = storageManager;
         mAccount = account;
         mSyncFileContents = syncFileContents;
         mStorageManager = storageManager;
         mAccount = account;
         mSyncFileContents = syncFileContents;

-        mLocalChangeAlreadyKnown = localChangeAlreadyKnown;

         mContext = context;
     }
 
         mContext = context;
     }
 


@@ -119,7 +116,7 @@ public class SynchronizeFileOperation extends RemoteOperation {
                         // server without etags
                         serverChanged = (mServerFile.getModificationTimestamp() > mLocalFile.getModificationTimestampAtLastSyncForData());
                     //}
                         // server without etags
                         serverChanged = (mServerFile.getModificationTimestamp() > mLocalFile.getModificationTimestampAtLastSyncForData());
                     //}

-                    boolean localChanged = (mLocalChangeAlreadyKnown || mLocalFile.getLocalModificationTimestamp() > mLocalFile.getLastSyncDateForData());
+                    boolean localChanged = (mLocalFile.getLocalModificationTimestamp() > mLocalFile.getLastSyncDateForData());

                         // TODO this will be always true after the app is upgraded to database version 2; will result in unnecessary uploads
               
                     /// decide action to perform depending upon changes
                         // TODO this will be always true after the app is upgraded to database version 2; will result in unnecessary uploads
               
                     /// decide action to perform depending upon changes