Changed OCFile to keep mRemotePath as a valid URL; CLEAR YOUR CACHE AFTER INSTALLING

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / Uploader.java

diff --git a/src/eu/alefzero/owncloud/Uploader.java b/src/eu/alefzero/owncloud/Uploader.java
index 3599579..757f803 100644 (file)
--- a/src/eu/alefzero/owncloud/Uploader.java
+++ b/src/eu/alefzero/owncloud/Uploader.java
@@ -18,7 +18,6 @@
 package eu.alefzero.owncloud;\r
 \r
 import java.io.File;\r
 package eu.alefzero.owncloud;\r
 \r
 import java.io.File;\r

-import java.net.URLEncoder;\r

 import java.util.ArrayList;\r
 import java.util.HashMap;\r
 import java.util.LinkedList;\r
 import java.util.ArrayList;\r
 import java.util.HashMap;\r
 import java.util.LinkedList;\r


@@ -215,7 +214,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         EditText mDirname;\r
 \r
         public a(String path, EditText dirname) {\r
         EditText mDirname;\r
 \r
         public a(String path, EditText dirname) {\r

-            mPath = path;\r
+            mPath = path; \r

             mDirname = dirname;\r
         }\r
 \r
             mDirname = dirname;\r
         }\r
 \r


@@ -239,6 +238,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
     }\r
 \r
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {\r
     }\r
 \r
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {\r

+        // click on folder in the list\r

         Log.d(TAG, "on item click");\r
         Vector<OCFile> tmpfiles = mStorageManager.getDirectoryContent(mFile);\r
         if (tmpfiles == null) return;\r
         Log.d(TAG, "on item click");\r
         Vector<OCFile> tmpfiles = mStorageManager.getDirectoryContent(mFile);\r
         if (tmpfiles == null) return;\r


@@ -255,11 +255,13 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
     }\r
 \r
     public void onClick(View v) {\r
     }\r
 \r
     public void onClick(View v) {\r

+        // click on button\r

         switch (v.getId()) {\r
         case R.id.uploader_choose_folder:\r
         switch (v.getId()) {\r
         case R.id.uploader_choose_folder:\r

-            mUploadPath = "";\r
+            mUploadPath = "/";\r

             for (String p : mParents)\r
             for (String p : mParents)\r

-                mUploadPath += URLEncoder.encode(p) + "/";\r
+                mUploadPath += p + "/";\r
+            mUploadPath = Uri.encode(mUploadPath, "/");\r

             Log.d(TAG, "Uploading file to dir " + mUploadPath);\r
 \r
             uploadFiles();\r
             Log.d(TAG, "Uploading file to dir " + mUploadPath);\r
 \r
             uploadFiles();\r


@@ -408,11 +410,11 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
                 final String display_name = c.getString(c.getColumnIndex(Media.DISPLAY_NAME)),\r
                              data = c.getString(c.getColumnIndex(Media.DATA));\r
                 local[i] = data;\r
                 final String display_name = c.getString(c.getColumnIndex(Media.DISPLAY_NAME)),\r
                              data = c.getString(c.getColumnIndex(Media.DATA));\r
                 local[i] = data;\r

-                remote[i] = mUploadPath + display_name;\r
+                remote[i] = mUploadPath + Uri.encode(display_name);\r

             } else if (uri.getScheme().equals("file")) {\r
                 final File file = new File(Uri.decode(uri.toString()).replace(uri.getScheme() + "://", ""));\r
                 local[i] = file.getAbsolutePath();\r
             } else if (uri.getScheme().equals("file")) {\r
                 final File file = new File(Uri.decode(uri.toString()).replace(uri.getScheme() + "://", ""));\r
                 local[i] = file.getAbsolutePath();\r

-                remote[i] = mUploadPath + file.getName();\r
+                remote[i] = mUploadPath + Uri.encode(file.getName());\r

             }\r
 \r
         }\r
             }\r
 \r
         }\r