Download failures not treated as successes

[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 c051fc1..734359e 100644 (file)
--- a/src/eu/alefzero/owncloud/files/services/FileDownloader.java
+++ b/src/eu/alefzero/owncloud/files/services/FileDownloader.java
@@ -33,8 +33,10 @@ 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_ACCOUNT = "ACCOUNT";\r
     public static final String EXTRA_FILE_PATH = "FILE_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

     public static final String EXTRA_FILE_SIZE = "FILE_SIZE";\r
     private static final String TAG = "FileDownloader";\r
 \r
     public static final String EXTRA_FILE_SIZE = "FILE_SIZE";\r
     private static final String TAG = "FileDownloader";\r
 \r


@@ -43,6 +45,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
     private ServiceHandler mServiceHandler;\r
     private Account mAccount;\r
     private String mFilePath;\r
     private ServiceHandler mServiceHandler;\r
     private Account mAccount;\r
     private String mFilePath;\r

+    private String mRemotePath;\r

     private int mLastPercent;\r
     private long mTotalDownloadSize;\r
     private long mCurrentDownlodSize;\r
     private int mLastPercent;\r
     private long mTotalDownloadSize;\r
     private long mCurrentDownlodSize;\r


@@ -85,6 +88,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
         }\r
         mAccount = intent.getParcelableExtra(EXTRA_ACCOUNT);\r
         mFilePath = intent.getStringExtra(EXTRA_FILE_PATH);\r
         }\r
         mAccount = intent.getParcelableExtra(EXTRA_ACCOUNT);\r
         mFilePath = intent.getStringExtra(EXTRA_FILE_PATH);\r

+        mRemotePath = intent.getStringExtra(EXTRA_REMOTE_PATH);\r

         Message msg = mServiceHandler.obtainMessage();\r
         msg.arg1 = startId;\r
         mServiceHandler.sendMessage(msg);\r
         Message msg = mServiceHandler.obtainMessage();\r
         msg.arg1 = startId;\r
         mServiceHandler.sendMessage(msg);\r


@@ -141,7 +145,8 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
 \r
         Log.e(TAG, file.getAbsolutePath() + " " + oc_url.toString());\r
         Log.e(TAG, mFilePath+"");\r
 \r
         Log.e(TAG, file.getAbsolutePath() + " " + oc_url.toString());\r
         Log.e(TAG, mFilePath+"");\r

-        if (wdc.downloadFile(mFilePath, file)) {\r
+        String message;\r
+        if (wdc.downloadFile(mRemotePath, file)) {\r

             ContentValues cv = new ContentValues();\r
             cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getAbsolutePath());\r
             getContentResolver().update(\r
             ContentValues cv = new ContentValues();\r
             cv.put(ProviderTableMeta.FILE_STORAGE_PATH, file.getAbsolutePath());\r
             getContentResolver().update(\r


@@ -152,9 +157,13 @@ 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
+            message = BAD_DOWNLOAD_MESSAGE;\r

         }\r
         }\r

+        \r

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

-        Intent end = new Intent(DOWNLOAD_FINISH_MESSAGE);\r
+        Intent end = new Intent(message);\r

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