Merge branch 'develop' into forbidden_characters_from_server

Conflicts:
	owncloud-android-library
	src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
	src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java

diff --cc owncloud-android-library
index 4ca0ff2,639cb7e..060ca75
--- 1/owncloud-android-library
--- 2/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 4ca0ff2203a84173dca984632a1131170a169f08
 -Subproject commit 639cb7eacdae0b4b6dddbd8f446d8d42eb2617b5
++Subproject commit 060ca75f17c90b7c083bdeb8ba7376cf15f8c7ec

diff --cc res/values/strings.xml
Simple merge

diff --cc src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
index 52e0425,73ae8bd..ac1e312
--- 1/src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
--- 2/src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
@@@ -52,9 -51,9 +51,9 @@@ public class CreateFolderDialogFragmen
  
      /**
       * Public factory method to create new CreateFolderDialogFragment instances.
--     * 
 -     * @param parentFolder    Folder to create
 -     * @return                Dialog ready to show.
++     *
 +     * @param parentFolder            Folder to create
 +     * @return                        Dialog ready to show.
       */
      public static CreateFolderDialogFragment newInstance(OCFile parentFolder) {
          CreateFolderDialogFragment frag = new CreateFolderDialogFragment();
@@@ -107,18 -106,12 +106,18 @@@
                          Toast.LENGTH_LONG).show();
                  return;
              }
- 
-             boolean serverWithForbiddenChars = ((ComponentsGetter)getSherlockActivity()).
 -            
 -            if (!FileUtils.isValidName(newFolderName)) {
 -                Toast.makeText(
 -                        getActivity(),
 -                        R.string.filename_forbidden_characters, 
 -                        Toast.LENGTH_LONG).show();
++            boolean serverWithForbiddenChars = ((ComponentsGetter)getActivity()).
 +                    getFileOperationsHelper().isVersionWithForbiddenCharacters();
 +
 +            if (!FileUtils.isValidName(newFolderName, serverWithForbiddenChars)) {
 +                int messageId = 0;
 +                if (serverWithForbiddenChars) {
 +                    messageId = R.string.filename_forbidden_charaters_from_server;
 +                } else {
 +                    messageId = R.string.filename_forbidden_characters;
 +                }
-                 Toast.makeText(getSherlockActivity(), messageId, Toast.LENGTH_LONG).show();
++                Toast.makeText(getActivity(), messageId, Toast.LENGTH_LONG).show();
++
                  return;
              }
              

diff --cc src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
index fa0c65d,4093060..d4bf31c
--- 1/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
--- 2/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java
@@@ -118,23 -118,17 +118,24 @@@ public class RenameFileDialogFragmen
                          Toast.LENGTH_LONG).show();
                  return;
              }
 -            
 -            if (!FileUtils.isValidName(newFileName)) {
 -                Toast.makeText(
 -                        getActivity(),
 -                        R.string.filename_forbidden_characters, 
 -                        Toast.LENGTH_LONG).show();
 +
-             boolean serverWithForbiddenChars = ((ComponentsGetter)getSherlockActivity()).
++            boolean serverWithForbiddenChars = ((ComponentsGetter)getActivity()).
 +                    getFileOperationsHelper().isVersionWithForbiddenCharacters();
 +
 +            if (!FileUtils.isValidName(newFileName, serverWithForbiddenChars)) {
 +                int messageId = 0;
 +                if (serverWithForbiddenChars) {
 +                    messageId = R.string.filename_forbidden_charaters_from_server;
 +                } else {
 +                    messageId = R.string.filename_forbidden_characters;
 +                }
-                 Toast.makeText(getSherlockActivity(), messageId, Toast.LENGTH_LONG).show();
++                Toast.makeText(getActivity(), messageId, Toast.LENGTH_LONG).show();
                  return;
              }
  
-             ((ComponentsGetter)getSherlockActivity()).getFileOperationsHelper().
 -            ((ComponentsGetter)getActivity()).getFileOperationsHelper().renameFile(mTargetFile,
 -                    newFileName);
++            ((ComponentsGetter)getActivity()).getFileOperationsHelper().
 +                    renameFile(mTargetFile, newFileName);
++
          }
      }
  }