From: masensio <masensio@solidgear.es>
Date: Thu, 14 Nov 2013 16:23:25 +0000 (+0100)
Subject: Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operat... 
X-Git-Tag: oc-android-1.5.5~123^2~9
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f299079851589e2af2d4aa93a77eecda6438b004?ds=inline;hp=-c

Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_rename_folder

Conflicts:
	oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
---

f299079851589e2af2d4aa93a77eecda6438b004
diff --combined oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
index b11c6084,f25c22ed..5ee07d79
--- a/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
+++ b/oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
@@@ -29,17 -29,19 +29,19 @@@ public class CreateRemoteFolderOperatio
      private static final int CONNECTION_TIMEOUT = 5000;
      
  
-     
+     protected String mFolderName;
      protected String mRemotePath;
      protected boolean mCreateFullPath;
      
      /**
       * Constructor
       * 
+      * @param folderName			Name of new directory
       * @param remotePath            Full path to the new directory to create in the remote server.
       * @param createFullPath        'True' means that all the ancestor folders should be created if don't exist yet.
       */
-     public CreateRemoteFolderOperation(String remotePath, boolean createFullPath) {
+     public CreateRemoteFolderOperation(String folderName, String remotePath, boolean createFullPath) {
+     	mFolderName = folderName;
          mRemotePath = remotePath;
          mCreateFullPath = createFullPath;
      }
@@@ -54,7 -56,7 +56,11 @@@
          RemoteOperationResult result = null;
          MkColMethod mkcol = null;
          
++<<<<<<< HEAD
 +        boolean noInvalidChars = FileUtils.validateName(mRemotePath, true);
++=======
+         boolean noInvalidChars = FileUtils.validateName(mFolderName);
++>>>>>>> refactor_remote_operation_to_create_folder
          if (noInvalidChars) {
          	try {
          		mkcol = new MkColMethod(client.getBaseUri() + WebdavUtils.encodePath(mRemotePath));
@@@ -85,7 -87,7 +91,7 @@@
  
      
      private RemoteOperationResult createParentFolder(String parentPath, WebdavClient client) {
-         RemoteOperation operation = new CreateRemoteFolderOperation(  parentPath,
+         RemoteOperation operation = new CreateRemoteFolderOperation("", parentPath,
                                                                  mCreateFullPath);
          return operation.execute(client);
      }