X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/eb1c63d3dc5294e2ff7a7d2c32d762fd25286223..d29a3658c9b22cd60f0900aabd987fdb0d48ed5b:/src/eu/alefzero/owncloud/Uploader.java

diff --git a/src/eu/alefzero/owncloud/Uploader.java b/src/eu/alefzero/owncloud/Uploader.java
index fcb22a2a..523db940 100644
--- 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);
                 mCursor.moveToFirst();
                 pathToUpload = mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_PATH))
-                        + mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_NAME)).replace(" ", "%20");
+                        + mCursor.getString(mCursor.getColumnIndex(ProviderTableMeta.FILE_NAME)).replace(" ", "%20");   // TODO don't make this ; use WebdavUtils.encode in the right moment
             }
             a a = new a(pathToUpload, dirName);
             builder.setPositiveButton(R.string.common_ok, a);
@@ -251,10 +251,9 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
         // click on button
         switch (v.getId()) {
         case R.id.uploader_choose_folder:
-            mUploadPath = "/";
+            mUploadPath = "";   // first element in mParents is root dir, represented by ""; init mUploadPath with "/" results in a "//" prefix
             for (String p : mParents)
-                mUploadPath += p + "/";
-            mUploadPath = Uri.encode(mUploadPath, "/");
+                mUploadPath += p + OCFile.PATH_SEPARATOR;
             Log.d(TAG, "Uploading file to dir " + mUploadPath);
 
             uploadFiles();
@@ -370,6 +369,7 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
 
     public void uploadFiles() {
         WebdavClient wdc = new WebdavClient(mAccount, getApplicationContext());
+        wdc.allowSelfsignedCertificates();
 
         // create last directory in path if nessesary
         if (mCreateDir) {
@@ -393,11 +393,11 @@ public class Uploader extends ListActivity implements OnItemClickListener, andro
                 final String display_name = c.getString(c.getColumnIndex(Media.DISPLAY_NAME)),
                              data = c.getString(c.getColumnIndex(Media.DATA));
                 local[i] = data;
-                remote[i] = mUploadPath + Uri.encode(display_name);
+                remote[i] = mUploadPath + display_name;
             } else if (uri.getScheme().equals("file")) {
                 final File file = new File(Uri.decode(uri.toString()).replace(uri.getScheme() + "://", ""));
                 local[i] = file.getAbsolutePath();
-                remote[i] = mUploadPath + Uri.encode(file.getName());
+                remote[i] = mUploadPath + file.getName();
             }
 
         }