mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 06:05:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #836 from owncloud/download_folder__fixing_recursive_cancellation

Browse source 
Fix of recursive cancellation
This commit is contained in:
David A. Velasco 2015-01-08 17:05:35 +01:00
commit eb6ec5dcf3
3 changed files with 54 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/com/owncloud/android/files/services/FileDownloader.java
View file

@ -96,9 +96,6 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
private NotificationCompat.Builder mNotificationBuilder;
private int mLastPercent;
private Account mAccount;
private OCFile mFile;
public static String getDownloadAddedMessage() {
return FileDownloader.class.getName().toString() + DOWNLOAD_ADDED_MESSAGE;
@ -150,24 +147,24 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
Log_OC.e(TAG, "Not enough information provided in intent");
return START_NOT_STICKY;
} else {
mAccount = intent.getParcelableExtra(EXTRA_ACCOUNT);
mFile = intent.getParcelableExtra(EXTRA_FILE);
final Account account = intent.getParcelableExtra(EXTRA_ACCOUNT);
final OCFile file = intent.getParcelableExtra(EXTRA_FILE);
if (ACTION_CANCEL_FILE_DOWNLOAD.equals(intent.getAction())) {
new Thread(new Runnable() {
public void run() {
// Cancel the download
cancel(mAccount,mFile);
cancel(account, file);
}
}).start();
} else {
AbstractList<String> requestedDownloads = new Vector<String>(); // dvelasco: now this always contains just one element, but that can change in a near future (download of multiple selection)
String downloadKey = buildRemoteName(mAccount, mFile);
String downloadKey = buildRemoteName(account, file);
try {
DownloadFileOperation newDownload = new DownloadFileOperation(mAccount, mFile);
DownloadFileOperation newDownload = new DownloadFileOperation(account, file);
mPendingDownloads.putIfAbsent(downloadKey, newDownload);
newDownload.addDatatransferProgressListener(this);
newDownload.addDatatransferProgressListener((FileDownloaderBinder) mBinder);

60
src/com/owncloud/android/operations/SynchronizeFolderOperation.java
View file

@ -165,13 +165,23 @@ public class SynchronizeFolderOperation extends SyncOperation {
sendBroadcastForNotifyingUIUpdate(result.isSuccess());
}
}
if (mCancellationRequested.get()) {
throw new OperationCancelledException();
}
} catch (OperationCancelledException e) {
result = new RemoteOperationResult(e);
// cancel 'child' synchronizations
for (SyncOperation synchOp: mFoldersToWalkDown) {
((SynchronizeFolderOperation) synchOp).cancel();
}
// Needed in case that cancellation occurs before starting any download.
// If not, yellow arrow continues being shown.
sendBroadcastForNotifyingUIUpdate(false);
Intent intent = new Intent(mContext, FileDownloader.class);
intent.setAction(FileDownloader.ACTION_CANCEL_FILE_DOWNLOAD);
intent.putExtra(FileDownloader.EXTRA_ACCOUNT, mAccount);
intent.putExtra(FileDownloader.EXTRA_FILE, mLocalFolder);
mContext.startService(intent);
}
return result;
@ -275,7 +285,8 @@ public class SynchronizeFolderOperation extends SyncOperation {
* retrieved.
* @return 'True' when any change was made in the local data, 'false' otherwise
*/
private void synchronizeData(ArrayList<Object> folderAndFiles, OwnCloudClient client) {
private void synchronizeData(ArrayList<Object> folderAndFiles, OwnCloudClient client)
throws OperationCancelledException {
FileDataStorageManager storageManager = getStorageManager();
// parse data from remote folder
@ -290,7 +301,13 @@ public class SynchronizeFolderOperation extends SyncOperation {
mFilesForDirectDownload.clear();
mFilesToSyncContentsWithoutUpload.clear();
mFavouriteFilesToSyncContents.clear();
mFoldersToWalkDown.clear();
synchronized(mFoldersToWalkDown) {
if (mCancellationRequested.get()) {
throw new OperationCancelledException();
}
mFoldersToWalkDown.clear();
}
// get current data about local contents of the folder to synchronize
List<OCFile> localFiles = storageManager.getFolderContent(mLocalFolder);
@ -352,8 +369,14 @@ public class SynchronizeFolderOperation extends SyncOperation {
mAccount,
mCurrentSyncTime
);
mFoldersToWalkDown.add(synchFolderOp);
synchronized(mFoldersToWalkDown) {
if (mCancellationRequested.get()) {
throw new OperationCancelledException();
}
mFoldersToWalkDown.add(synchFolderOp);
}
} else if (remoteFile.keepInSync()) {
/// prepare content synchronization for kept-in-sync files
SynchronizeFileOperation operation = new SynchronizeFileOperation(
@ -387,7 +410,7 @@ public class SynchronizeFolderOperation extends SyncOperation {
}
private void prepareOpsFromLocalKnowledge() {
private void prepareOpsFromLocalKnowledge() throws OperationCancelledException {
List<OCFile> children = getStorageManager().getFolderContent(mLocalFolder);
for (OCFile child : children) {
/// classify file to sync/download contents later
@ -399,8 +422,14 @@ public class SynchronizeFolderOperation extends SyncOperation {
mAccount,
mCurrentSyncTime
);
mFoldersToWalkDown.add(synchFolderOp);
synchronized(mFoldersToWalkDown) {
if (mCancellationRequested.get()) {
throw new OperationCancelledException();
}
mFoldersToWalkDown.add(synchFolderOp);
}
} else {
/// prepare limited synchronization for regular files
if (!child.isDown()) {
@ -541,6 +570,13 @@ public class SynchronizeFolderOperation extends SyncOperation {
*/
public void cancel() {
mCancellationRequested.set(true);
synchronized(mFoldersToWalkDown) {
// cancel 'child' synchronizations
for (SyncOperation synchOp : mFoldersToWalkDown) {
((SynchronizeFolderOperation) synchOp).cancel();
}
}
}
public String getFolderPath() {

2
src/com/owncloud/android/ui/activity/FileActivity.java
View file

@ -512,7 +512,7 @@ implements OnRemoteOperationListener, ComponentsGetter {
}
private void onSynchronizeFolderOperationFinish(SynchronizeFolderOperation operation, RemoteOperationResult result) {
if (!result.isSuccess()){
if (!result.isSuccess() && result.getCode() != ResultCode.CANCELLED){
Toast t = Toast.makeText(this, ErrorMessageAdapter.getErrorCauseMessage(result, operation, getResources()),
Toast.LENGTH_LONG);
t.show();