From 449822818bf8c52aebcd4d784bf7818f56026b91 Mon Sep 17 00:00:00 2001 From: Bartek Przybylski Date: Wed, 23 May 2012 19:27:35 +0200 Subject: [PATCH] fix uploading to nonascii characters in path --- src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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); } } -- 2.11.0