From 0c8d508a61de7fe698c1f87e2a8415bea2efb1f0 Mon Sep 17 00:00:00 2001 From: jabarros Date: Tue, 16 Dec 2014 14:15:46 +0100 Subject: [PATCH] Run folder download cancelation in new thread --- .../android/files/services/FileDownloader.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 12ec4654..2519b6b9 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -95,6 +95,9 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis private NotificationManager mNotificationManager; private NotificationCompat.Builder mNotificationBuilder; private int mLastPercent; + + private Account mAccount; + private OCFile mFile; public static String getDownloadAddedMessage() { @@ -147,20 +150,24 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis Log_OC.e(TAG, "Not enough information provided in intent"); return START_NOT_STICKY; } else { - Account account = intent.getParcelableExtra(EXTRA_ACCOUNT); - OCFile file = intent.getParcelableExtra(EXTRA_FILE); + mAccount = intent.getParcelableExtra(EXTRA_ACCOUNT); + mFile = intent.getParcelableExtra(EXTRA_FILE); if (ACTION_CANCEL_FILE_DOWNLOAD.equals(intent.getAction())) { - // Cancel the download - cancel(account,file); + new Thread(new Runnable() { + public void run() { + // Cancel the download + cancel(mAccount,mFile); + } + }).start(); } else { AbstractList requestedDownloads = new Vector(); // dvelasco: now this always contains just one element, but that can change in a near future (download of multiple selection) - String downloadKey = buildRemoteName(account, file); + String downloadKey = buildRemoteName(mAccount, mFile); try { - DownloadFileOperation newDownload = new DownloadFileOperation(account, file); + DownloadFileOperation newDownload = new DownloadFileOperation(mAccount, mFile); mPendingDownloads.putIfAbsent(downloadKey, newDownload); newDownload.addDatatransferProgressListener(this); newDownload.addDatatransferProgressListener((FileDownloaderBinder) mBinder); -- 2.11.0