From: Lennart Rosam <lennart@familie-rosam.de>
Date: Wed, 23 May 2012 17:59:51 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git@gitorious.org/owncloud/android-devel.git
X-Git-Tag: oc-android-1.4.3~395
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/62908d175512a1a82bac58fb62dc6389045dff8c?hp=e8c9e5b09a18d1fa8a764046b7da1402fada46f1

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

diff --git a/res/layout/list_layout.xml b/res/layout/list_layout.xml
index 2a0d48b9..60fb0bff 100644
--- a/res/layout/list_layout.xml
+++ b/res/layout/list_layout.xml
@@ -37,8 +37,8 @@
 
         <ImageView
             android:id="@+id/imageView1"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
             android:layout_gravity="center_vertical|center"
             android:layout_margin="4dp"
             android:src="@drawable/ic_menu_archive" />
diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 832ccae8..a7dc0b85 100644
--- 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
     }
 
     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();
@@ -314,17 +313,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);
             }
         }
diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
index e3267309..24281b6e 100644
--- a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
@@ -144,15 +144,6 @@ public class FileListFragment extends FragmentListView {
         }
     }
 
-    @Override
-    public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int arg2, long arg3) {
-        ClipData.Item item = new ClipData.Item("ASD");
-        ClipDescription cd = new ClipDescription("ASD", new String[] { ClipDescription.MIMETYPE_TEXT_PLAIN });
-        ClipData dragData = new ClipData(cd, item);
-        arg1.startDrag(dragData, new View.DragShadowBuilder(arg0.getChildAt(arg2)), null, 0);
-        return true;
-    }
-
     /**
      * Call this, when the user presses the up button
      */
diff --git a/src/eu/alefzero/webdav/WebdavClient.java b/src/eu/alefzero/webdav/WebdavClient.java
index 66f27e49..f7cc060e 100644
--- a/src/eu/alefzero/webdav/WebdavClient.java
+++ b/src/eu/alefzero/webdav/WebdavClient.java
@@ -75,6 +75,12 @@ public class WebdavClient extends HttpClient {
     public boolean downloadFile(String filepath, File targetPath) {
         // HttpGet get = new HttpGet(mUri.toString() + filepath.replace(" ",
         // "%20"));
+        String[] splitted_filepath = filepath.split("/");
+        filepath = "";
+        for (String s : splitted_filepath) {
+            if (s.equals("")) continue;
+            filepath += "/" + URLEncoder.encode(s);
+        }
 
         Log.e("ASD", mUri.toString() + filepath.replace(" ", "%20") + "");
         GetMethod get = new GetMethod(mUri.toString()