X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/e5492540596256e511c4b00819640e804808764a..d5625e6cccd85dfb0f9e66a2da8f844341c96e2b:/src/com/owncloud/android/operations/SynchronizeFolderOperation.java diff --git a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java index 31e4e7a9..f5426527 100644 --- a/src/com/owncloud/android/operations/SynchronizeFolderOperation.java +++ b/src/com/owncloud/android/operations/SynchronizeFolderOperation.java @@ -43,6 +43,7 @@ import com.owncloud.android.lib.resources.shares.OCShare; import com.owncloud.android.lib.common.operations.RemoteOperation; import com.owncloud.android.lib.common.operations.RemoteOperationResult; import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCode; +import com.owncloud.android.lib.common.utils.Log_OC; import com.owncloud.android.lib.resources.shares.GetRemoteSharesForFileOperation; import com.owncloud.android.lib.resources.files.FileUtils; import com.owncloud.android.lib.resources.files.ReadRemoteFileOperation; @@ -51,7 +52,6 @@ import com.owncloud.android.lib.resources.files.RemoteFile; import com.owncloud.android.syncadapter.FileSyncAdapter; import com.owncloud.android.utils.FileStorageUtils; -import com.owncloud.android.utils.Log_OC; @@ -110,7 +110,7 @@ public class SynchronizeFolderOperation extends RemoteOperation { private boolean mRemoteFolderChanged; /** 'True' means that Etag will be ignored */ - private boolean mIgnoreTag; + private boolean mIgnoreETag; /** @@ -129,7 +129,7 @@ public class SynchronizeFolderOperation extends RemoteOperation { long currentSyncTime, boolean syncFullAccount, boolean isShareSupported, - boolean ignoreTag, + boolean ignoreETag, FileDataStorageManager dataStorageManager, Account account, Context context ) { @@ -142,7 +142,7 @@ public class SynchronizeFolderOperation extends RemoteOperation { mContext = context; mForgottenLocalFiles = new HashMap(); mRemoteFolderChanged = false; - mIgnoreTag = ignoreTag; + mIgnoreETag = ignoreETag; } @@ -233,7 +233,7 @@ public class SynchronizeFolderOperation extends RemoteOperation { if (result.isSuccess()){ OCFile remoteFolder = FileStorageUtils.fillOCFile((RemoteFile) result.getData().get(0)); - if (!mIgnoreTag) { + if (!mIgnoreETag) { // check if remote and local folder are different mRemoteFolderChanged = !(remoteFolder.getEtag().equalsIgnoreCase(mLocalFolder.getEtag())); }