Merge branch 'develop' into refactor_remote_operation_to_create_folder

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / EditNameDialog.java

diff --git a/src/com/owncloud/android/ui/dialog/EditNameDialog.java b/src/com/owncloud/android/ui/dialog/EditNameDialog.java
index 4d6243a..862715f 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/EditNameDialog.java
+++ b/src/com/owncloud/android/ui/dialog/EditNameDialog.java
@@ -27,10 +27,11 @@ import android.view.View;
 import android.view.WindowManager.LayoutParams;
 import android.widget.EditText;
 import android.widget.TextView;
 import android.view.WindowManager.LayoutParams;
 import android.widget.EditText;
 import android.widget.TextView;

+import android.widget.Toast;

 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.R;
 
 import com.actionbarsherlock.app.SherlockDialogFragment;
 import com.owncloud.android.R;

-
+import com.owncloud.android.oc_framework.utils.FileUtils;

 
 
 /**
 
 
 /**


@@ -129,6 +130,10 @@ public class EditNameDialog extends SherlockDialogFragment implements DialogInte
         switch (which) {
             case AlertDialog.BUTTON_POSITIVE: {
                 mNewFilename = ((TextView)(getDialog().findViewById(R.id.user_input))).getText().toString();
         switch (which) {
             case AlertDialog.BUTTON_POSITIVE: {
                 mNewFilename = ((TextView)(getDialog().findViewById(R.id.user_input))).getText().toString();

+                if (!FileUtils.isValidName(mNewFilename)) {
+                    Toast.makeText(getSherlockActivity(), R.string.filename_forbidden_characters, Toast.LENGTH_LONG).show();
+                    return;
+                }

                 mResult = true;
             }
             case AlertDialog.BUTTON_NEGATIVE: { // fall through
                 mResult = true;
             }
             case AlertDialog.BUTTON_NEGATIVE: { // fall through