Merge branch 'bug_hunting' into feature_previews

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / activity / FileDisplayActivity.java

diff --git a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
index ca0ff01..17504a8 100644 (file)
--- a/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
+++ b/src/com/owncloud/android/ui/activity/FileDisplayActivity.java
@@ -86,7 +86,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.ui.dialog.EditNameDialog;\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.FileFragment;\r
@@ -106,7 +108,7 @@ import eu.alefzero.webdav.WebdavClient;
  */\r
 \r
 public class FileDisplayActivity extends SherlockFragmentActivity implements\r
-    OCFileListFragment.ContainerActivity, FileFragment.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
@@ -152,10 +154,10 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         super.onCreate(savedInstanceState);\r
 \r
         /// Load of parameters from received intent\r
-        mCurrentDir = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); // no check necessary, mCurrenDir == null if the parameter is not in the intent\r
         Account account = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_ACCOUNT);\r
-        if (account != null)\r
-            AccountUtils.setCurrentOwnCloudAccount(this, account.name);\r
+        if (account != null && AccountUtils.setCurrentOwnCloudAccount(this, account.name)) {\r
+            mCurrentDir = getIntent().getParcelableExtra(FileDetailFragment.EXTRA_FILE); \r
+        }\r
         \r
         /// Load of saved instance state: keep this always before initDataFromCurrentAccount()\r
         if(savedInstanceState != null) {\r
@@ -200,7 +202,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         // Drop-down navigation \r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
         OCFile currFile = mCurrentDir;\r
-        while(currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {\r
+        while(mStorageManager != null && currFile != null && currFile.getFileName() != OCFile.PATH_SEPARATOR) {\r
             mDirectories.add(currFile.getFileName());\r
             currFile = mStorageManager.getFileById(currFile.getParentId());\r
         }\r
@@ -238,7 +240,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         \r
         \r
         // show changelog, if needed\r
-        showChangeLog();\r
+        //showChangeLog();\r
         \r
         Log.d(getClass().toString(), "onCreate() end");\r
     }\r
@@ -381,7 +383,8 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         boolean retval = true;\r
         switch (item.getItemId()) {\r
             case R.id.action_create_dir: {\r
-                showDialog(DIALOG_CREATE_DIR);\r
+                EditNameDialog dialog = EditNameDialog.newInstance(getString(R.string.uploader_info_dirname), "", this);\r
+                dialog.show(getSupportFragmentManager(), "createdirdialog");\r
                 break;\r
             }\r
             case R.id.action_sync_account: {\r
@@ -1452,6 +1455,32 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         }\r
     }\r
 \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
     private void requestForDownload() {\r
         Account account = AccountUtils.getCurrentOwnCloudAccount(this);\r