dont crash when trying to create dir in main directory

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 0f2daf0..af25107 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -232,6 +232,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
         if (mDirs != null)\r
             for (String s : mDirs)\r
                 mDirectories.insert(s, 0);\r
         if (mDirs != null)\r
             for (String s : mDirs)\r
                 mDirectories.insert(s, 0);\r

+        mCurrentDir = savedInstanceState.getParcelable(KEY_CURRENT_DIR);\r

     }\r
     \r
     @Override\r
     }\r
     \r
     @Override\r


@@ -285,7 +286,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             \r
             // Clear intent extra, so rotating the screen will not return us to this directory\r
             getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);\r
             \r
             // Clear intent extra, so rotating the screen will not return us to this directory\r
             getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);\r

-        } \r
+        } else {\r
+            mCurrentDir = mFileList.getCurrentFile();\r
+        }\r

                 \r
         // Drop-Down navigation and file list restore\r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r
                 \r
         // Drop-Down navigation and file list restore\r
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);\r


@@ -336,7 +339,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             unregisterReceiver(syncBroadcastRevceiver);\r
             syncBroadcastRevceiver = null;\r
         }\r
             unregisterReceiver(syncBroadcastRevceiver);\r
             syncBroadcastRevceiver = null;\r
         }\r

-    \r

     }\r
 \r
     @Override\r
     }\r
 \r
     @Override\r


@@ -361,7 +363,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             builder.setTitle(R.string.uploader_info_dirname);\r
             int typed_color = getResources().getColor(R.color.setup_text_typed);\r
             dirNameInput.setTextColor(typed_color);\r
             builder.setTitle(R.string.uploader_info_dirname);\r
             int typed_color = getResources().getColor(R.color.setup_text_typed);\r
             dirNameInput.setTextColor(typed_color);\r

-    \r

             builder.setPositiveButton(android.R.string.ok,\r
                     new OnClickListener() {\r
                         public void onClick(DialogInterface dialog, int which) {\r
             builder.setPositiveButton(android.R.string.ok,\r
                     new OnClickListener() {\r
                         public void onClick(DialogInterface dialog, int which) {\r


@@ -372,12 +373,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                             }\r
     \r
                             // Figure out the path where the dir needs to be created\r
                             }\r
     \r
                             // Figure out the path where the dir needs to be created\r

-                            String path = mCurrentDir.getRemotePath();\r
+                            String path = FileDisplayActivity.this.mCurrentDir.getRemotePath();\r

                             \r
                             // Create directory\r
                             path += directoryName + "/";\r
                             \r
                             // Create directory\r
                             path += directoryName + "/";\r

-                            Thread thread = new Thread(new DirectoryCreator(\r
-                                    path, a));\r
+                            Thread thread = new Thread(new DirectoryCreator(path, a));\r

                             thread.start();\r
     \r
                             // Save new directory in local database\r
                             thread.start();\r
     \r
                             // Save new directory in local database\r