X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/d860ae7cd462d08e3de523e2a6f29850bb8d2e96..ec6b9d7c70deb50152bfab5cb5f25c9a2dde28e7:/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 06ebc0b2..cd7afa62 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -109,15 +109,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 +142,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,18 +153,10 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis 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(account, file); - } - }).start(); - - } else { - */ + /*Log_OC.v( + "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Received request to download file" + );*/ AbstractList requestedDownloads = new Vector(); try { @@ -158,6 +168,10 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis ); String downloadKey = putResult.first; requestedDownloads.add(downloadKey); + /*Log_OC.v( + "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Download on " + file.getRemotePath() + " added to queue" + );*/ // Store file on db with state 'downloading' /* @@ -231,14 +245,24 @@ 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( + "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()); DownloadFileOperation download = removeResult.first; if (download != null) { + /*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());*/ mCurrentDownload.cancel(); } } @@ -335,9 +359,11 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis if (msg.obj != null) { Iterator it = requestedDownloads.iterator(); while (it.hasNext()) { - mService.downloadFile(it.next()); + String next = it.next(); + mService.downloadFile(next); } } + Log_OC.d(TAG, "Stopping after command with id " + msg.arg1); mService.stopSelf(msg.arg1); } } @@ -350,6 +376,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis */ private void downloadFile(String downloadKey) { + /*Log_OC.v( "NOW " + TAG + ", thread " + Thread.currentThread().getName(), + "Getting download of " + downloadKey);*/ mCurrentDownload = mPendingDownloads.get(downloadKey); if (mCurrentDownload != null) { @@ -359,22 +387,26 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis RemoteOperationResult downloadResult = null; try { /// prepare client object to send the request to the ownCloud server - if (mDownloadClient == null || !mCurrentAccount.equals(mCurrentDownload.getAccount())) { + if (mCurrentAccount == null || !mCurrentAccount.equals(mCurrentDownload.getAccount())) { mCurrentAccount = mCurrentDownload.getAccount(); - mStorageManager = - new FileDataStorageManager(mCurrentAccount, getContentResolver()); - OwnCloudAccount ocAccount = new OwnCloudAccount(mCurrentAccount, this); - mDownloadClient = OwnCloudClientManagerFactory.getDefaultSingleton(). - getClientFor(ocAccount, this); - } + 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) { @@ -385,6 +417,9 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis 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()); @@ -414,7 +449,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()); } @@ -528,8 +562,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(); @@ -594,50 +626,4 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis sendStickyBroadcast(added); } - /** - * Cancel operation - * @param account ownCloud account where the remote file is stored. - * @param file File OCFile - *-/ - public void cancel(Account account, OCFile file){ - DownloadFileOperation download = null; - //String targetKey = buildKey(account, file.getRemotePath()); - ArrayList keyItems = new ArrayList(); - if (file.isFolder()) { - Log_OC.d(TAG, "Folder download. Canceling pending downloads (from folder)"); - - // TODO - /* - Iterator it = mPendingDownloads.keySet().iterator(); - boolean found = false; - while (it.hasNext()) { - String keyDownloadOperation = it.next(); - found = keyDownloadOperation.startsWith(targetKey); - if (found) { - keyItems.add(keyDownloadOperation); - } - } - - for (String item: keyItems) { - download = mPendingDownloads.remove(item); - Log_OC.d(TAG, "Key removed: " + item); - - if (download != null) { - download.cancel(); - } - } - - *-/ - - } else { - // this is not really expected... - Log_OC.d(TAG, "Canceling file download"); - download = mPendingDownloads.remove(account, file.getRemotePath()); - if (download != null) { - download.cancel(); - } - } - } - */ - }