Merge branch 'master' of ssh://git@gitorious.org/owncloud/android-devel.git

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / FileDisplayActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 832ccae..a7dc0b8 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -290,7 +290,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     }\r
 \r
     public void onActivityResult(int requestCode, int resultCode, Intent data) {\r
-        Log.e("ASD", requestCode + " " + resultCode);\r
         if (resultCode == RESULT_OK) {\r
             if (requestCode == ACTION_SELECT_FILE) {\r
                 Uri selectedImageUri = data.getData();\r
@@ -314,17 +313,16 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                         AccountUtils.getCurrentOwnCloudAccount(this));\r
                 String remotepath = new String();\r
                 for (int j = mDirectories.getCount() - 2; j >= 0; --j) {\r
-                    remotepath += "/" + URLDecoder.decode(mDirectories.getItem(j));\r
+                    remotepath += "/" + URLEncoder.encode(mDirectories.getItem(j));\r
                 }\r
                 if (!remotepath.endsWith("/"))\r
                     remotepath += "/";\r
-                remotepath += new File(filepath).getName();\r
+                remotepath += URLEncoder.encode(new File(filepath).getName());\r
                 Log.e("ASD", remotepath + "");\r
 \r
                 i.putExtra(FileUploader.KEY_LOCAL_FILE, filepath);\r
                 i.putExtra(FileUploader.KEY_REMOTE_FILE, remotepath);\r
-                i.putExtra(FileUploader.KEY_UPLOAD_TYPE,\r
-                        FileUploader.UPLOAD_SINGLE_FILE);\r
+                i.putExtra(FileUploader.KEY_UPLOAD_TYPE, FileUploader.UPLOAD_SINGLE_FILE);\r
                 startService(i);\r
             }\r
         }\r