X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7d16de3c0700bae4edec438ab833a819374566fc..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 70292af0..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) ) { @@ -135,23 +155,10 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis final Account account = intent.getParcelableExtra(EXTRA_ACCOUNT); final OCFile file = intent.getParcelableExtra(EXTRA_FILE); - Log_OC.v( + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Received request to download file" - ); - - /* - if (ACTION_CANCEL_FILE_DOWNLOAD.equals(intent.getAction())) { - - new Thread(new Runnable() { - public void run() { - // Cancel the download - cancel(account, file); - } - }).start(); - - } else { - */ + );*/ AbstractList requestedDownloads = new Vector(); try { @@ -163,10 +170,10 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis ); String downloadKey = putResult.first; requestedDownloads.add(downloadKey); - Log_OC.v( + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Download on " + file.getRemotePath() + " added to queue" - ); + );*/ // Store file on db with state 'downloading' /* @@ -240,29 +247,65 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis * @param file A file in the queue of pending downloads */ public void cancel(Account account, OCFile file) { - Log_OC.v( + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), "Received request to cancel download of " + file.getRemotePath() ); Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Removing download of " + file.getRemotePath()); - Pair removeResult = mPendingDownloads.remove(account, file.getRemotePath()); + "Removing download of " + 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(), - "Canceling returned download of " + file.getRemotePath()); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Canceling returned download of " + file.getRemotePath());*/ download.cancel(); } else { if (mCurrentDownload != null && mCurrentAccount != null && mCurrentDownload.getRemotePath().startsWith(file.getRemotePath()) && account.name.equals(mCurrentAccount.name)) { - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Canceling current sync as descendant: " + mCurrentDownload.getRemotePath()); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Canceling current sync as descendant: " + mCurrentDownload.getRemotePath());*/ mCurrentDownload.cancel(); } } } - + + /** + * 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(); @@ -328,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 + } } @@ -355,74 +409,82 @@ 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) { - Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), - "Getting download of " + downloadKey); + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Getting download of " + downloadKey);*/ 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 (mDownloadClient == null || !mCurrentAccount.equals(mCurrentDownload.getAccount())) { - mCurrentAccount = mCurrentDownload.getAccount(); - mStorageManager = - new FileDataStorageManager(mCurrentAccount, getContentResolver()); + // Detect if the account exists + if (AccountUtils.exists(mCurrentDownload.getAccount(), getApplicationContext())) { + Log_OC.d(TAG, "Account " + mCurrentDownload.getAccount().toString() + " exists"); + 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); - } - /// 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(); - /*} else { - updateUnsuccessfulDownloadedFile(); - */ - } - - } 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()); + /// 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); - /// notify result - notifyDownloadResult(mCurrentDownload, downloadResult); + } finally { + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Removing payload " + mCurrentDownload.getRemotePath());*/ - sendBroadcastDownloadFinished(mCurrentDownload, downloadResult, removeResult.second); - } + Pair removeResult = + mPendingDownloads.removePayload(mCurrentAccount, mCurrentDownload.getRemotePath()); + /// notify result + notifyDownloadResult(mCurrentDownload, downloadResult); + + sendBroadcastDownloadFinished(mCurrentDownload, downloadResult, removeResult.second); + } + } else { + // Cancel the transfer + Log_OC.d(TAG, "Account " + mCurrentDownload.getAccount().toString() + " doesn't exist"); + cancelDownloadsForAccount(mCurrentDownload.getAccount()); + + } } } @@ -443,7 +505,6 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis file.setStoragePath(mCurrentDownload.getSavePath()); file.setFileLength((new File(mCurrentDownload.getSavePath()).length())); file.setRemoteId(mCurrentDownload.getFile().getRemoteId()); - //file.setDownloading(false); mStorageManager.saveFile(file); mStorageManager.triggerMediaScan(file.getStoragePath()); } @@ -557,8 +618,6 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis .setContentIntent(PendingIntent.getActivity( this, (int) System.currentTimeMillis(), updateAccountCredentials, PendingIntent.FLAG_ONE_SHOT)); - mDownloadClient = null; // grant that future retries on the same account will get the fresh credentials - } else { // TODO put something smart in showDetailsIntent Intent showDetailsIntent = new Intent(); @@ -623,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); + } + } + } + } + } + } + + }