X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/d8d75623e49a10942c5d02137032c40984c674ea..afaa2879d192be067cae523b51dad75d89a6c6cb:/src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java diff --git a/src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java b/src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java index 29b3be28..5274a1b2 100644 --- a/src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java +++ b/src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java @@ -1,5 +1,8 @@ -/* ownCloud Android client application - * Copyright (C) 2014 ownCloud Inc. +/** + * ownCloud Android client application + * + * @author David A. Velasco + * Copyright (C) 2015 ownCloud Inc. * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2, @@ -18,6 +21,7 @@ package com.owncloud.android.ui.dialog; import com.actionbarsherlock.app.SherlockDialogFragment; +import com.owncloud.android.MainApp; import com.owncloud.android.R; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.lib.resources.files.FileUtils; @@ -37,9 +41,7 @@ import android.widget.Toast; /** * Dialog to input the name for a new folder to create. * - * Triggers the folder creation when name is confirmed. - * - * @author David A. Velasco + * Triggers the folder creation when name is confirmed. */ public class CreateFolderDialogFragment extends SherlockDialogFragment implements DialogInterface.OnClickListener { @@ -51,8 +53,8 @@ extends SherlockDialogFragment implements DialogInterface.OnClickListener { /** * Public factory method to create new CreateFolderDialogFragment instances. * - * @param file File to remove. - * @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(); @@ -105,8 +107,11 @@ extends SherlockDialogFragment implements DialogInterface.OnClickListener { Toast.LENGTH_LONG).show(); return; } - - if (!FileUtils.isValidName(newFolderName)) { + + + if (!FileUtils.isValidName(newFolderName, + ((ComponentsGetter)getSherlockActivity()). + getFileOperationsHelper().isVersionWithForbiddenCharacters())) { Toast.makeText( getSherlockActivity(), R.string.filename_forbidden_characters,