Quick & dirty fix to avoid that 'create folder' dialog keeps the name of the last...

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index c8dbca9..7df1ecb 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -85,7 +85,9 @@ import com.owncloud.android.operations.SynchronizeFileOperation;
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.syncadapter.FileSyncService;\r
 import com.owncloud.android.ui.dialog.ChangelogDialog;\r
 import com.owncloud.android.operations.RemoteOperationResult.ResultCode;\r
 import com.owncloud.android.syncadapter.FileSyncService;\r
 import com.owncloud.android.ui.dialog.ChangelogDialog;\r

+import com.owncloud.android.ui.dialog.EditNameDialog;\r

 import com.owncloud.android.ui.dialog.SslValidatorDialog;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog;\r

+import com.owncloud.android.ui.dialog.EditNameDialog.EditNameDialogListener;\r

 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 import com.owncloud.android.ui.fragment.OCFileListFragment;\r
 import com.owncloud.android.ui.dialog.SslValidatorDialog.OnSslValidatorListener;\r
 import com.owncloud.android.ui.fragment.FileDetailFragment;\r
 import com.owncloud.android.ui.fragment.OCFileListFragment;\r


@@ -101,7 +103,7 @@ import eu.alefzero.webdav.WebdavClient;
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r

-    OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener, OnRemoteOperationListener {\r
+    OCFileListFragment.ContainerActivity, FileDetailFragment.ContainerActivity, OnNavigationListener, OnSslValidatorListener, OnRemoteOperationListener, EditNameDialogListener {\r

     \r
     private ArrayAdapter<String> mDirectories;\r
     private OCFile mCurrentDir = null;\r
     \r
     private ArrayAdapter<String> mDirectories;\r
     private OCFile mCurrentDir = null;\r


@@ -345,8 +347,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         boolean retval = true;\r
         switch (item.getItemId()) {\r
             case R.id.createDirectoryItem: {\r
         boolean retval = true;\r
         switch (item.getItemId()) {\r
             case R.id.createDirectoryItem: {\r

-                showDialog(DIALOG_CREATE_DIR);\r
-                break;\r
+                //showDialog(DIALOG_CREATE_DIR);\r
+                EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.uploader_info_dirname), "", this);\r
+                dialog.show(getSupportFragmentManager(), "createdirdialog");\r

             }\r
             case R.id.startSync: {\r
                 startSynchronization();\r
             }\r
             case R.id.startSync: {\r
                 startSynchronization();\r


@@ -1282,7 +1285,32 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
     }\r
 \r
 \r
     }\r
 \r
 \r

-    \r
-\r
+    @Override\r
+    public void onDismiss(EditNameDialog dialog) {\r
+        //dialog.dismiss();\r
+        if (dialog.getResult()) {\r
+            String newDirectoryName = dialog.getNewFilename().trim();\r
+            Log.d(TAG, "'create directory' dialog dismissed with new name " + newDirectoryName);\r
+            if (newDirectoryName.length() > 0) {\r
+                String path;\r
+                if (mCurrentDir == null) {\r
+                    // this is just a patch; we should ensure that mCurrentDir never is null\r
+                    if (!mStorageManager.fileExists(OCFile.PATH_SEPARATOR)) {\r
+                        OCFile file = new OCFile(OCFile.PATH_SEPARATOR);\r
+                        mStorageManager.saveFile(file);\r
+                    }\r
+                    mCurrentDir = mStorageManager.getFileByPath(OCFile.PATH_SEPARATOR);\r
+                }\r
+                path = FileDisplayActivity.this.mCurrentDir.getRemotePath();\r
+                \r
+                // Create directory\r
+                path += newDirectoryName + OCFile.PATH_SEPARATOR;\r
+                Thread thread = new Thread(new DirectoryCreator(path,  AccountUtils.getCurrentOwnCloudAccount(FileDisplayActivity.this), new Handler()));\r
+                thread.start();\r
+                \r
+                showDialog(DIALOG_SHORT_WAIT);\r
+            }\r
+        }\r
+    }\r

 \r
 }\r
 \r
 }\r