X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/876204faf03075e286cf550b3bfba86d3f5a1419..705d2eb7733e23fa1f7e0b6e23ced754b7f07dcc:/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 0e7850b5..fa0c65de 100644 --- a/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java +++ b/src/com/owncloud/android/ui/dialog/RenameFileDialogFragment.java @@ -118,16 +118,23 @@ extends SherlockDialogFragment implements DialogInterface.OnClickListener { Toast.LENGTH_LONG).show(); return; } - - if (!FileUtils.isValidName(newFileName)) { - Toast.makeText( - getSherlockActivity(), - R.string.filename_forbidden_characters, - Toast.LENGTH_LONG).show(); + + boolean serverWithForbiddenChars = ((ComponentsGetter)getSherlockActivity()). + 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(); return; } - ((ComponentsGetter)getSherlockActivity()).getFileOperationsHelper().renameFile(mTargetFile, newFileName); + ((ComponentsGetter)getSherlockActivity()).getFileOperationsHelper(). + renameFile(mTargetFile, newFileName); } } }