FIxed null pointer exception when a file details view receives a message from the...

[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 fcb22a2..354b007 100644 (file)
--- a/src/eu/alefzero/owncloud/Uploader.java
+++ b/src/eu/alefzero/owncloud/Uploader.java
@@ -166,7 +166,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
                         null, null, null);\r
                 mCursor.moveToFirst();\r
                 pathToUpload = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_PATH))\r
-                        + mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_NAME)).replace(" ", "%20");\r
+                        + mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_NAME)).replace(" ", "%20");   // TODO don't make this ; use WebdavUtils.encode in the right moment\r
             }\r
             a a = new a(pathToUpload, dirName);\r
             builder.setPositiveButton(R.string.common_ok, a);\r
@@ -251,10 +251,9 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         // click on button\r
         switch (v.getId()) {\r
         case R.id.uploader_choose_folder:\r
-            mUploadPath = "/";\r
+            mUploadPath = "";   // first element in mParents is root dir, represented by ""; init mUploadPath with "/" results in a "//" prefix\r
             for (String p : mParents)\r
-                mUploadPath += p + "/";\r
-            mUploadPath = Uri.encode(mUploadPath, "/");\r
+                mUploadPath += p + OCFile.PATH_SEPARATOR;\r
             Log.d(TAG, "Uploading file to dir " + mUploadPath);\r
 \r
             uploadFiles();\r
@@ -393,11 +392,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
-                remote[i] = mUploadPath + Uri.encode(display_name);\r
+                remote[i] = mUploadPath + 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
-                remote[i] = mUploadPath + Uri.encode(file.getName());\r
+                remote[i] = mUploadPath + file.getName();\r
             }\r
 \r
         }\r