Granted that accounts different only in port number won't mix their files in the...

[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 af327a5..b0dd2b2 100644 (file)
--- a/src/eu/alefzero/owncloud/files/services/FileDownloader.java
+++ b/src/eu/alefzero/owncloud/files/services/FileDownloader.java
@@ -13,6 +13,7 @@ import android.app.PendingIntent;
 import android.app.Service;\r
 import android.content.ContentValues;\r
 import android.content.Intent;\r
 import android.app.Service;\r
 import android.content.ContentValues;\r
 import android.content.Intent;\r

+import android.net.Uri;\r

 import android.os.Environment;\r
 import android.os.Handler;\r
 import android.os.HandlerThread;\r
 import android.os.Environment;\r
 import android.os.Handler;\r
 import android.os.HandlerThread;\r


@@ -82,14 +83,16 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
         }\r
     }\r
     \r
         }\r
     }\r
     \r

-    public static final String getSavePath() {\r
+    public static final String getSavePath(String accountName) {\r

         File sdCard = Environment.getExternalStorageDirectory();\r
         File sdCard = Environment.getExternalStorageDirectory();\r

-        return sdCard.getAbsolutePath() + "/owncloud/";\r
+        return sdCard.getAbsolutePath() + "/owncloud/" + Uri.encode(accountName, "@");   \r
+            // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names, that can be in the accountName since 0.1.190B\r

     }\r
     \r
     }\r
     \r

-    public static final String getTemporalPath() {\r
+    public static final String getTemporalPath(String accountName) {\r

         File sdCard = Environment.getExternalStorageDirectory();\r
         File sdCard = Environment.getExternalStorageDirectory();\r

-        return sdCard.getAbsolutePath() + "/owncloud.tmp/";\r
+        return sdCard.getAbsolutePath() + "/owncloud/tmp/" + Uri.encode(accountName, "@");\r
+            // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names, that can be in the accountName since 0.1.190B\r

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


@@ -155,7 +158,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
 \r
         \r
         /// download will be in a temporal file\r
 \r
         \r
         /// download will be in a temporal file\r

-        File tmpFile = new File(getTemporalPath() + mAccount.name + mFilePath);\r
+        File tmpFile = new File(getTemporalPath(mAccount.name) + mFilePath);\r

         \r
         /// create status notification to show the download progress\r
         mNotification = new Notification(R.drawable.icon, getString(R.string.downloader_download_in_progress_ticker), System.currentTimeMillis());\r
         \r
         /// create status notification to show the download progress\r
         mNotification = new Notification(R.drawable.icon, getString(R.string.downloader_download_in_progress_ticker), System.currentTimeMillis());\r


@@ -175,7 +178,7 @@ public class FileDownloader extends Service implements OnDatatransferProgressLis
         File newFile = null;\r
         try {\r
             if (wdc.downloadFile(mRemotePath, tmpFile)) {\r
         File newFile = null;\r
         try {\r
             if (wdc.downloadFile(mRemotePath, tmpFile)) {\r

-                newFile = new File(getSavePath() + mAccount.name + mFilePath);\r
+                newFile = new File(getSavePath(mAccount.name) + mFilePath);\r

                 newFile.getParentFile().mkdirs();\r
                 boolean moved = tmpFile.renameTo(newFile);\r
             \r
                 newFile.getParentFile().mkdirs();\r
                 boolean moved = tmpFile.renameTo(newFile);\r
             \r