X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/5116bd99e26954fb83621863ff26e351d0a08cfd..cb175f29949dbac17a3870a71ecff60df5c9bdc4:/src/com/owncloud/android/files/services/FileDownloader.java diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index feedc11c..a126028b 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -25,8 +25,10 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; import java.util.Vector; +import java.util.concurrent.ConcurrentMap; import com.owncloud.android.R; +import com.owncloud.android.authentication.AccountUtils; import com.owncloud.android.authentication.AuthenticatorActivity; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; @@ -109,15 +111,31 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis @Override public void onCreate() { super.onCreate(); + Log_OC.d(TAG, "Creating service"); mNotificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); - HandlerThread thread = new HandlerThread("FileDownloaderThread", - Process.THREAD_PRIORITY_BACKGROUND); + HandlerThread thread = new HandlerThread("FileDownloaderThread", Process.THREAD_PRIORITY_BACKGROUND); thread.start(); mServiceLooper = thread.getLooper(); mServiceHandler = new ServiceHandler(mServiceLooper, this); mBinder = new FileDownloaderBinder(); } + + /** + * Service clean up + */ + @Override + public void onDestroy() { + Log_OC.v(TAG, "Destroying service" ); + mBinder = null; + mServiceHandler = null; + mServiceLooper.quit(); + mServiceLooper = null; + mNotificationManager = null; + super.onDestroy(); + } + + /** * Entry point to add one or several files to the queue of downloads. * @@ -126,6 +144,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis */ @Override public int onStartCommand(Intent intent, int flags, int startId) { + Log_OC.d(TAG, "Starting command with id " + startId); + if ( !intent.hasExtra(EXTRA_ACCOUNT) || !intent.hasExtra(EXTRA_FILE) ) { @@ -233,7 +253,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis ); Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Removing download of " + file.getRemotePath());*/ - Pair removeResult = mPendingDownloads.remove(account, file.getRemotePath()); + Pair removeResult = + mPendingDownloads.remove(account, file.getRemotePath()); DownloadFileOperation download = removeResult.first; if (download != null) { /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), @@ -249,7 +270,42 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis } } } - + + /** + * Cancels a pending or current upload for an account + * + * @param account Owncloud accountName where the remote file will be stored. + */ + public void cancel(Account account) { + Log_OC.d(TAG, "Account= " + account.name); + + if (mCurrentDownload != null) { + Log_OC.d(TAG, "Current Download Account= " + mCurrentDownload.getAccount().name); + if (mCurrentDownload.getAccount().name.equals(account.name)) { + mCurrentDownload.cancel(); + } + } + // Cancel pending downloads + ConcurrentMap downloadsAccount = mPendingDownloads.get(account); + Iterator it = downloadsAccount.keySet().iterator(); + Log_OC.d(TAG, "Number of pending downloads= " + downloadsAccount.size()); + while (it.hasNext()) { + String key = it.next(); + Log_OC.d(TAG, "download CANCELLED " + key); + if (key.startsWith(account.name)) { + DownloadFileOperation download; + synchronized (mPendingDownloads) { + download = mPendingDownloads.get(key); + if (download != null) { + String remotePath = download.getRemotePath(); + if (mPendingDownloads.contains(account, remotePath)) { + mPendingDownloads.remove(account, remotePath); + } + } + } + } + } + } public void clearListeners() { mBoundListeners.clear(); @@ -315,6 +371,17 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis boundListener.onTransferProgress(progressRate, totalTransferredSoFar, totalToTransfer, fileName); } } + + /** + * Review downloads and cancel it if its account doesn't exist + */ + public void reviewDownloads() { + if (mCurrentDownload != null && + !AccountUtils.exists(mCurrentDownload.getAccount(), getApplicationContext())) { + mCurrentDownload.cancel(); + } + // The rest of downloads are cancelled when they try to start + } } @@ -342,19 +409,18 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis Iterator it = requestedDownloads.iterator(); while (it.hasNext()) { String next = it.next(); - /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Handling download file " + next);*/ mService.downloadFile(next); } } + Log_OC.d(TAG, "Stopping after command with id " + msg.arg1); mService.stopSelf(msg.arg1); } } - + /** * Core download method: requests a file to download and stores it. - * + * * @param downloadKey Key to access the download to perform, contained in mPendingDownloads */ private void downloadFile(String downloadKey) { @@ -364,54 +430,61 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis mCurrentDownload = mPendingDownloads.get(downloadKey); if (mCurrentDownload != null) { - - notifyDownloadStart(mCurrentDownload); - - RemoteOperationResult downloadResult = null; - try { - /// prepare client object to send the request to the ownCloud server - if (mCurrentAccount == null || !mCurrentAccount.equals(mCurrentDownload.getAccount())) { - mCurrentAccount = mCurrentDownload.getAccount(); - mStorageManager = new FileDataStorageManager( - mCurrentAccount, - getContentResolver() - ); - } // else, reuse storage manager from previous operation - - // always get client from client manager, to get fresh credentials in case of update - OwnCloudAccount ocAccount = new OwnCloudAccount(mCurrentAccount, this); - mDownloadClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, this); + // Detect if the account exists + if (AccountUtils.exists(mCurrentDownload.getAccount(), getApplicationContext())) { + Log_OC.d(TAG, "Account " + mCurrentDownload.getAccount().toString() + " exists"); + notifyDownloadStart(mCurrentDownload); - - /// perform the download - /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + RemoteOperationResult downloadResult = null; + try { + /// prepare client object to send the request to the ownCloud server + if (mCurrentAccount == null || !mCurrentAccount.equals(mCurrentDownload.getAccount())) { + mCurrentAccount = mCurrentDownload.getAccount(); + mStorageManager = new FileDataStorageManager( + mCurrentAccount, + getContentResolver() + ); + } // else, reuse storage manager from previous operation + + // always get client from client manager, to get fresh credentials in case of update + OwnCloudAccount ocAccount = new OwnCloudAccount(mCurrentAccount, this); + mDownloadClient = OwnCloudClientManagerFactory.getDefaultSingleton(). + getClientFor(ocAccount, this); + + + /// perform the download + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Executing download of " + mCurrentDownload.getRemotePath());*/ - downloadResult = mCurrentDownload.execute(mDownloadClient); - if (downloadResult.isSuccess()) { - saveDownloadedFile(); - } - - } catch (AccountsException e) { - Log_OC.e(TAG, "Error while trying to get authorization for " + mCurrentAccount.name, e); - downloadResult = new RemoteOperationResult(e); - } catch (IOException e) { - Log_OC.e(TAG, "Error while trying to get authorization for " + mCurrentAccount.name, e); - downloadResult = new RemoteOperationResult(e); - - } finally { + downloadResult = mCurrentDownload.execute(mDownloadClient); + if (downloadResult.isSuccess()) { + saveDownloadedFile(); + } + + } catch (AccountsException e) { + Log_OC.e(TAG, "Error while trying to get authorization for " + mCurrentAccount.name, e); + downloadResult = new RemoteOperationResult(e); + } catch (IOException e) { + Log_OC.e(TAG, "Error while trying to get authorization for " + mCurrentAccount.name, e); + downloadResult = new RemoteOperationResult(e); + + } finally { /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Removing payload " + mCurrentDownload.getRemotePath());*/ - Pair removeResult = - mPendingDownloads.removePayload(mCurrentAccount, mCurrentDownload.getRemotePath()); + Pair removeResult = + mPendingDownloads.removePayload(mCurrentAccount, mCurrentDownload.getRemotePath()); - /// notify result - notifyDownloadResult(mCurrentDownload, downloadResult); + /// notify result + notifyDownloadResult(mCurrentDownload, downloadResult); - sendBroadcastDownloadFinished(mCurrentDownload, downloadResult, removeResult.second); - } + sendBroadcastDownloadFinished(mCurrentDownload, downloadResult, removeResult.second); + } + } else { + // Cancel the transfer + Log_OC.d(TAG, "Account " + mCurrentDownload.getAccount().toString() + " doesn't exist"); + cancelDownloadsForAccount(mCurrentDownload.getAccount()); + } } } @@ -609,4 +682,32 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis sendStickyBroadcast(added); } + /** + * Remove downloads of an account + * @param account + */ + private void cancelDownloadsForAccount(Account account){ + // Cancel pending downloads + ConcurrentMap downloadsAccount = mPendingDownloads.get(account); + Iterator it = downloadsAccount.keySet().iterator(); + Log_OC.d(TAG, "Number of pending downloads= " + downloadsAccount.size()); + while (it.hasNext()) { + String key = it.next(); + Log_OC.d(TAG, "download CANCELLED " + key); + if (key.startsWith(account.name)) { + DownloadFileOperation download; + synchronized (mPendingDownloads) { + download = mPendingDownloads.get(key); + if (download != null) { + String remotePath = download.getRemotePath(); + if (mPendingDownloads.contains(account, remotePath)) { + mPendingDownloads.remove(account, remotePath); + } + } + } + } + } + } + + }