From 3f2081e6073bd0c11d672890f350da80abc554b2 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Thu, 22 Nov 2012 16:40:00 +0100 Subject: [PATCH] Ensure that FileDownloader and FileUploader events are not lost --- src/com/owncloud/android/files/services/FileDownloader.java | 12 ++++++------ src/com/owncloud/android/files/services/FileUploader.java | 2 +- src/com/owncloud/android/ui/fragment/FileDetailFragment.java | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java index 51b8406a..f58e563c 100644 --- a/src/com/owncloud/android/files/services/FileDownloader.java +++ b/src/com/owncloud/android/files/services/FileDownloader.java @@ -380,7 +380,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis end.putExtra(ACCOUNT_NAME, download.getAccount().name); end.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath()); end.putExtra(EXTRA_FILE_PATH, download.getSavePath()); - sendBroadcast(end); + sendStickyBroadcast(end); } @@ -390,11 +390,11 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis * @param download Added download operation */ private void sendBroadcastNewDownload(DownloadFileOperation download) { - Intent end = new Intent(DOWNLOAD_ADDED_MESSAGE); - /*end.putExtra(ACCOUNT_NAME, download.getAccount().name); - end.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());*/ - end.putExtra(EXTRA_FILE_PATH, download.getSavePath()); - sendBroadcast(end); + Intent added = new Intent(DOWNLOAD_ADDED_MESSAGE); + /*added.putExtra(ACCOUNT_NAME, download.getAccount().name); + added.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());*/ + added.putExtra(EXTRA_FILE_PATH, download.getSavePath()); + sendStickyBroadcast(added); } } diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java index a841361d..1847a960 100644 --- a/src/com/owncloud/android/files/services/FileUploader.java +++ b/src/com/owncloud/android/files/services/FileUploader.java @@ -683,7 +683,7 @@ public class FileUploader extends Service implements OnDatatransferProgressListe end.putExtra(ACCOUNT_NAME, upload.getAccount().name); end.putExtra(EXTRA_UPLOAD_RESULT, uploadResult.isSuccess()); end.putExtra(EXTRA_PARENT_DIR_ID, upload.getFile().getParentId()); - sendBroadcast(end); + sendStickyBroadcast(end); } diff --git a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java index 17bde9b7..9338b93f 100644 --- a/src/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -707,6 +707,7 @@ public class FileDetailFragment extends SherlockFragment implements private class UploadFinishReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { + Log.d(TAG, "Received broacast! : " + intent.getStringExtra(FileUploader.EXTRA_REMOTE_PATH)); String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME); if (!isEmpty() && accountName.equals(mAccount.name)) { -- 2.11.0