Explicit default values for network timeouts; fixed null pointer in message broadcast...

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / files / services / FileDownloader.java

diff --git a/src/eu/alefzero/owncloud/files/services/FileDownloader.java b/src/eu/alefzero/owncloud/files/services/FileDownloader.java
index cb5d0c8..e5316b3 100644 (file)
--- a/src/eu/alefzero/owncloud/files/services/FileDownloader.java
+++ b/src/eu/alefzero/owncloud/files/services/FileDownloader.java
@@ -164,16 +164,14 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
             }\r
         }\r
         \r
             }\r
         }\r
         \r

-        if (!download_result) {\r
-            tmpFile.delete();\r
-        }\r
-        \r

         mNotificationMngr.cancel(1);\r
         Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE);\r
         mNotificationMngr.cancel(1);\r
         Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE);\r

-        end.putExtra(EXTRA_REMOTE_PATH, mRemotePath);\r
-        end.putExtra(EXTRA_FILE_PATH, newFile.getAbsolutePath());\r

         end.putExtra(EXTRA_DOWNLOAD_RESULT, download_result);\r
         end.putExtra(ACCOUNT_NAME, mAccount.name);\r
         end.putExtra(EXTRA_DOWNLOAD_RESULT, download_result);\r
         end.putExtra(ACCOUNT_NAME, mAccount.name);\r

+        end.putExtra(EXTRA_REMOTE_PATH, mRemotePath);\r
+        if (download_result) {\r
+            end.putExtra(EXTRA_FILE_PATH, newFile.getAbsolutePath());\r
+        }\r

         sendBroadcast(end);\r
 \r
         if (download_result) {\r
         sendBroadcast(end);\r
 \r
         if (download_result) {\r