tryToLogin must get parameters now

[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 a5ee28f..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
+    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_REMOTE_PATH = "REMOTE_PATH";\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 String mRemotePath;\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
+        mRemotePath = intent.getStringExtra(EXTRA_REMOTE_PATH);\r
         Message msg = mServiceHandler.obtainMessage();\r
         msg.arg1 = startId;\r
         mServiceHandler.sendMessage(msg);\r
@@ -124,12 +128,16 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
         mNotification.contentView = new RemoteViews(getApplicationContext().getPackageName(), R.layout.progressbar_layout);\r
         mNotification.contentView.setProgressBar(R.id.status_progress, 100, 0, mTotalDownloadSize == -1);\r
         mNotification.contentView.setImageViewResource(R.id.status_icon, R.drawable.icon);\r
+        // dvelasco ; contentIntent MUST be assigned to avoid app crashes in versions previous to Android 4.x ;\r
+        //              BUT an empty Intent is not a very elegant solution; something smart should happen when a user 'clicks' on a download in the notification bar\r
+        mNotification.contentIntent = PendingIntent.getActivity(getApplicationContext(), 0, new Intent(), PendingIntent.FLAG_UPDATE_CURRENT);\r
         \r
         mNotificationMngr.notify(1, mNotification);\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
@@ -137,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
-        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
@@ -148,9 +157,14 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
                     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
         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
 \r