From bf90cb0f16bb6865717f645888c9274e01f45548 Mon Sep 17 00:00:00 2001 From: masensio Date: Thu, 5 Jun 2014 14:39:24 +0200 Subject: [PATCH] Review cancel download for keep_in_sync files. Clear etag for parent folder, to force the download when refreshing the folder --- src/com/owncloud/android/files/FileOperationsHelper.java | 9 ++++++++- src/com/owncloud/android/ui/fragment/OCFileListFragment.java | 3 +++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/com/owncloud/android/files/FileOperationsHelper.java b/src/com/owncloud/android/files/FileOperationsHelper.java index c473c0f0..841994e9 100644 --- a/src/com/owncloud/android/files/FileOperationsHelper.java +++ b/src/com/owncloud/android/files/FileOperationsHelper.java @@ -253,8 +253,15 @@ public class FileOperationsHelper { FileDownloaderBinder downloaderBinder = mFileActivity.getFileDownloaderBinder(); FileUploaderBinder uploaderBinder = mFileActivity.getFileUploaderBinder(); if (downloaderBinder != null && downloaderBinder.isDownloading(account, file)) { + // Remove etag for parent, if file is a keep_in_sync + if (file.keepInSync()) { + OCFile parent = mFileActivity.getStorageManager().getFileById(file.getParentId()); + parent.setEtag(""); + mFileActivity.getStorageManager().saveFile(parent); + } + downloaderBinder.cancel(account, file); - + } else if (uploaderBinder != null && uploaderBinder.isUploading(account, file)) { uploaderBinder.cancel(account, file); } diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java index 23bfe6e9..44f76736 100644 --- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -440,6 +440,9 @@ public class OCFileListFragment extends ExtendedListFragment { super.onRefresh(); if (mFile != null) { + // Refresh mFile + mFile = mContainerActivity.getStorageManager().getFileById(mFile.getFileId()); + listDirectory(mFile); ((FileDisplayActivity)mContainerActivity).startSyncFolderOperation(mFile); -- 2.11.0