Avoid fullscreen searchview when editing

[pub/Android/ownCloud.git] / 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 5274a1b..7b58f4d 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/CreateFolderDialogFragment.java
@@ -20,17 +20,16 @@
 
 package com.owncloud.android.ui.dialog;
 
 
 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;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.lib.resources.files.FileUtils;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 

-import android.app.AlertDialog;
+import android.support.v7.app.AlertDialog;

 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.app.Dialog;
 import android.content.DialogInterface;
 import android.os.Bundle;

+import android.support.v4.app.DialogFragment;

 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager.LayoutParams;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.WindowManager.LayoutParams;


@@ -43,8 +42,8 @@ import android.widget.Toast;
  * 
  *  Triggers the folder creation when name is confirmed.
  */
  * 
  *  Triggers the folder creation when name is confirmed.
  */

-public class CreateFolderDialogFragment 
-extends SherlockDialogFragment implements DialogInterface.OnClickListener {
+public class CreateFolderDialogFragment
+        extends DialogFragment implements DialogInterface.OnClickListener {

 
     private static final String ARG_PARENT_FOLDER = "PARENT_FOLDER";
     
 
     private static final String ARG_PARENT_FOLDER = "PARENT_FOLDER";
     


@@ -52,7 +51,7 @@ extends SherlockDialogFragment implements DialogInterface.OnClickListener {
 
     /**
      * Public factory method to create new CreateFolderDialogFragment instances.
 
     /**
      * 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.
      */


@@ -73,7 +72,7 @@ extends SherlockDialogFragment implements DialogInterface.OnClickListener {
         mParentFolder = getArguments().getParcelable(ARG_PARENT_FOLDER);
         
         // Inflate the layout for the dialog
         mParentFolder = getArguments().getParcelable(ARG_PARENT_FOLDER);
         
         // Inflate the layout for the dialog

-        LayoutInflater inflater = getSherlockActivity().getLayoutInflater();
+        LayoutInflater inflater = getActivity().getLayoutInflater();

         View v = inflater.inflate(R.layout.edit_box_dialog, null);
         
         // Setup layout 
         View v = inflater.inflate(R.layout.edit_box_dialog, null);
         
         // Setup layout 


@@ -82,7 +81,7 @@ extends SherlockDialogFragment implements DialogInterface.OnClickListener {
         inputText.requestFocus();
         
         // Build the dialog  
         inputText.requestFocus();
         
         // Build the dialog  

-        AlertDialog.Builder builder = new AlertDialog.Builder(getSherlockActivity());
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());

         builder.setView(v)
                .setPositiveButton(R.string.common_ok, this)
                .setNegativeButton(R.string.common_cancel, this)
         builder.setView(v)
                .setPositiveButton(R.string.common_ok, this)
                .setNegativeButton(R.string.common_cancel, this)


@@ -102,26 +101,29 @@ extends SherlockDialogFragment implements DialogInterface.OnClickListener {
             
             if (newFolderName.length() <= 0) {
                 Toast.makeText(
             
             if (newFolderName.length() <= 0) {
                 Toast.makeText(

-                        getSherlockActivity(), 
+                        getActivity(),

                         R.string.filename_empty, 
                         Toast.LENGTH_LONG).show();
                 return;
             }
                         R.string.filename_empty, 
                         Toast.LENGTH_LONG).show();
                 return;
             }

+            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(getActivity(), messageId, Toast.LENGTH_LONG).show();

 
 

-            if (!FileUtils.isValidName(newFolderName,
-                    ((ComponentsGetter)getSherlockActivity()).
-                            getFileOperationsHelper().isVersionWithForbiddenCharacters())) {
-                Toast.makeText(
-                        getSherlockActivity(), 
-                        R.string.filename_forbidden_characters, 
-                        Toast.LENGTH_LONG).show();

                 return;
             }
             
             String path = mParentFolder.getRemotePath();
             path += newFolderName + OCFile.PATH_SEPARATOR;
                 return;
             }
             
             String path = mParentFolder.getRemotePath();
             path += newFolderName + OCFile.PATH_SEPARATOR;

-            ((ComponentsGetter)getSherlockActivity()).
+            ((ComponentsGetter)getActivity()).

                 getFileOperationsHelper().createFolder(path, false);
         }
     }
                 getFileOperationsHelper().createFolder(path, false);
         }
     }