From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Wed, 23 May 2012 17:27:35 +0000 (+0200)
Subject: fix uploading to nonascii characters in path
X-Git-Tag: oc-android-1.4.3~395^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/449822818bf8c52aebcd4d784bf7818f56026b91?ds=inline

fix uploading to nonascii characters in path
---

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