X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/26f68e0eac0f7770251b9ff4e1cfaa22f57d75cc..0723ae4b096db5cf75a4a94e0900c4110e54a5b6:/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 08367c12..71d7f721 100644 --- a/src/com/owncloud/android/operations/SynchronizeFileOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFileOperation.java @@ -94,7 +94,7 @@ public class SynchronizeFileOperation extends RemoteOperation { } } - if (result == null) { // true if the server was not checked. nothing was wrong with the remote request + if (result.isSuccess()) { /// check changes in server and local file boolean serverChanged = false; @@ -103,7 +103,7 @@ public class SynchronizeFileOperation extends RemoteOperation { serverChanged = (!mServerFile.getEtag().equals(mLocalFile.getEtag())); // TODO could this be dangerous when the user upgrades the server from non-tagged to tagged? } else { */ // server without etags - serverChanged = (mServerFile.getModificationTimestamp() > mLocalFile.getModificationTimestampAtLastSyncForData()); + serverChanged = (mServerFile.getModificationTimestamp() != mLocalFile.getModificationTimestampAtLastSyncForData()); //} 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