Forgot the new icon!

[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 7a88f6a..cc66e38 100644 (file)
--- a/src/eu/alefzero/owncloud/files/services/FileDownloader.java
+++ b/src/eu/alefzero/owncloud/files/services/FileDownloader.java
@@ -20,6 +20,7 @@ import android.os.Message;
 import android.os.Process;\r
 import android.util.Log;\r
 import android.widget.RemoteViews;\r
 import android.os.Process;\r
 import android.util.Log;\r
 import android.widget.RemoteViews;\r

+import android.widget.Toast;\r

 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r


@@ -28,7 +29,7 @@ import eu.alefzero.webdav.WebdavClient;
 \r
 public class FileDownloader extends Service implements OnDatatransferProgressListener {\r
     public static final String DOWNLOAD_FINISH_MESSAGE = "DOWNLOAD_FINISH";\r
 \r
 public class FileDownloader extends Service implements OnDatatransferProgressListener {\r
     public static final String DOWNLOAD_FINISH_MESSAGE = "DOWNLOAD_FINISH";\r

-    public static final String BAD_DOWNLOAD_MESSAGE = "BAD_DOWNLOAD";    \r
+    public static final String EXTRA_DOWNLOAD_RESULT = "RESULT";    \r

     public static final String EXTRA_ACCOUNT = "ACCOUNT";\r
     public static final String EXTRA_FILE_PATH = "FILE_PATH";\r
     public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH";\r
     public static final String EXTRA_ACCOUNT = "ACCOUNT";\r
     public static final String EXTRA_FILE_PATH = "FILE_PATH";\r
     public static final String EXTRA_REMOTE_PATH = "REMOTE_PATH";\r


@@ -127,14 +128,9 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
 \r
         File sdCard = Environment.getExternalStorageDirectory();\r
         File file = new File(sdCard.getAbsolutePath() + "/owncloud/" + mAccount.name + mFilePath);\r
 \r
         File sdCard = Environment.getExternalStorageDirectory();\r
         File file = new File(sdCard.getAbsolutePath() + "/owncloud/" + mAccount.name + mFilePath);\r

-        try {\r
-            file.getParentFile().mkdirs();\r
-            file.createNewFile();\r
-        } catch (IOException e) {\r
-            e.printStackTrace();\r
-        }\r
+        file.getParentFile().mkdirs();\r

 \r
 \r

-        String message;\r
+        boolean download_result = false;\r

         if (wdc.downloadFile(mRemotePath, file)) {\r
             ContentValues cv = new ContentValues();\r
             cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getAbsolutePath());\r
         if (wdc.downloadFile(mRemotePath, file)) {\r
             ContentValues cv = new ContentValues();\r
             cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getAbsolutePath());\r


@@ -146,16 +142,22 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
                     new String[] {\r
                             mFilePath.substring(mFilePath.lastIndexOf('/') + 1),\r
                             mAccount.name });            \r
                     new String[] {\r
                             mFilePath.substring(mFilePath.lastIndexOf('/') + 1),\r
                             mAccount.name });            \r

-            message = DOWNLOAD_FINISH_MESSAGE;\r
-        } else {\r
-            file.delete();\r
-            message = BAD_DOWNLOAD_MESSAGE;\r
+            download_result = true;\r

         }\r
         \r
         mNotificationMngr.cancel(1);\r
         }\r
         \r
         mNotificationMngr.cancel(1);\r

-        Intent end = new Intent(message);\r
+        Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE);\r
+        end.putExtra(EXTRA_REMOTE_PATH, mRemotePath);\r

         end.putExtra(EXTRA_FILE_PATH, file.getAbsolutePath());\r
         end.putExtra(EXTRA_FILE_PATH, file.getAbsolutePath());\r

+        end.putExtra(EXTRA_DOWNLOAD_RESULT, download_result);\r

         sendBroadcast(end);\r
         sendBroadcast(end);\r

+\r
+        if (download_result) {\r
+            Toast.makeText(this, R.string.downloader_download_succeed , Toast.LENGTH_SHORT).show();\r
+        } else {\r
+            Toast.makeText(this, R.string.downloader_download_failed , Toast.LENGTH_SHORT).show();\r
+        }\r
+        \r

     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r


@@ -170,5 +172,6 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
         \r
         mLastPercent = percent;\r
     }\r
         \r
         mLastPercent = percent;\r
     }\r

-\r
+    \r
+    \r

 }\r
 }\r