X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/66f3a45d050c27e41296ddc9083d968cfd8803a4..ff82b51e49f40155e7c340090f5ee759af2bf3ad:/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java diff --git a/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java b/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java index 40930608..d4bf31c2 100644 --- a/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java +++ b/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java @@ -118,17 +118,24 @@ public class RenameFileDialogFragment Toast.LENGTH_LONG).show(); return; } - - if (!FileUtils.isValidName(newFileName)) { - Toast.makeText( - getActivity(), - R.string.filename_forbidden_characters, - Toast.LENGTH_LONG).show(); + + 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(getActivity(), messageId, Toast.LENGTH_LONG).show(); return; } - ((ComponentsGetter)getActivity()).getFileOperationsHelper().renameFile(mTargetFile, - newFileName); + ((ComponentsGetter)getActivity()).getFileOperationsHelper(). + renameFile(mTargetFile, newFileName); + } } }