Ensure that FileDownloader and FileUploader events are not lost

diff --git a/src/com/owncloud/android/files/services/FileDownloader.java b/src/com/owncloud/android/files/services/FileDownloader.java
index 51b8406..f58e563 100644 (file)
--- 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);\r
         end.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());\r
         end.putExtra(EXTRA_FILE_PATH, download.getSavePath());\r
         end.putExtra(ACCOUNT_NAME, download.getAccount().name);\r
         end.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());\r
         end.putExtra(EXTRA_FILE_PATH, download.getSavePath());\r

-        sendBroadcast(end);\r
+        sendStickyBroadcast(end);\r

     }\r
     \r
     \r
     }\r
     \r
     \r


@@ -390,11 +390,11 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
      * @param download          Added download operation\r
      */\r
     private void sendBroadcastNewDownload(DownloadFileOperation download) {\r
      * @param download          Added download operation\r
      */\r
     private void sendBroadcastNewDownload(DownloadFileOperation download) {\r

-        Intent end = new Intent(DOWNLOAD_ADDED_MESSAGE);\r
-        /*end.putExtra(ACCOUNT_NAME, download.getAccount().name);\r
-        end.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());*/\r
-        end.putExtra(EXTRA_FILE_PATH, download.getSavePath());\r
-        sendBroadcast(end);\r
+        Intent added = new Intent(DOWNLOAD_ADDED_MESSAGE);\r
+        /*added.putExtra(ACCOUNT_NAME, download.getAccount().name);\r
+        added.putExtra(EXTRA_REMOTE_PATH, download.getRemotePath());*/\r
+        added.putExtra(EXTRA_FILE_PATH, download.getSavePath());\r
+        sendStickyBroadcast(added);\r

     }\r
 \r
 }\r
     }\r
 \r
 }\r

diff --git a/src/com/owncloud/android/files/services/FileUploader.java b/src/com/owncloud/android/files/services/FileUploader.java
index a841361..1847a96 100644 (file)
--- 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());
         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 17bde9b..9338b93 100644 (file)
--- 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 {\r
         @Override\r
         public void onReceive(Context context, Intent intent) {\r
     private class UploadFinishReceiver extends BroadcastReceiver {\r
         @Override\r
         public void onReceive(Context context, Intent intent) {\r

+            Log.d(TAG, "Received broacast! : " + intent.getStringExtra(FileUploader.EXTRA_REMOTE_PATH));\r

             String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME);\r
 \r
             if (!isEmpty() && accountName.equals(mAccount.name)) {\r
             String accountName = intent.getStringExtra(FileUploader.ACCOUNT_NAME);\r
 \r
             if (!isEmpty() && accountName.equals(mAccount.name)) {\r