From: Bartek Przybylski <bart.p.pl@gmail.com>
Date: Sun, 17 Jun 2012 09:46:24 +0000 (+0200)
Subject: dont crash when trying to create dir in main directory
X-Git-Tag: oc-android-1.4.3~363
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/a674df97dac8f9fff874689b64c5e3a09b3abb1a?ds=sidebyside

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 0f2daf01..af251073 100644
--- 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)
             for (String s : mDirs)
                 mDirectories.insert(s, 0);
+        mCurrentDir = savedInstanceState.getParcelable(KEY_CURRENT_DIR);
     }
     
     @Override
@@ -285,7 +286,9 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             
             // Clear intent extra, so rotating the screen will not return us to this directory
             getIntent().removeExtra(FileDetailFragment.EXTRA_FILE);
-        } 
+        } else {
+            mCurrentDir = mFileList.getCurrentFile();
+        }
                 
         // Drop-Down navigation and file list restore
         mDirectories = new CustomArrayAdapter<String>(this, R.layout.sherlock_spinner_dropdown_item);
@@ -336,7 +339,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             unregisterReceiver(syncBroadcastRevceiver);
             syncBroadcastRevceiver = null;
         }
-    
     }
 
     @Override
@@ -361,7 +363,6 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             builder.setTitle(R.string.uploader_info_dirname);
             int typed_color = getResources().getColor(R.color.setup_text_typed);
             dirNameInput.setTextColor(typed_color);
-    
             builder.setPositiveButton(android.R.string.ok,
                     new OnClickListener() {
                         public void onClick(DialogInterface dialog, int which) {
@@ -372,12 +373,11 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                             }
     
                             // Figure out the path where the dir needs to be created
-                            String path = mCurrentDir.getRemotePath();
+                            String path = FileDisplayActivity.this.mCurrentDir.getRemotePath();
                             
                             // Create directory
                             path += directoryName + "/";
-                            Thread thread = new Thread(new DirectoryCreator(
-                                    path, a));
+                            Thread thread = new Thread(new DirectoryCreator(path, a));
                             thread.start();
     
                             // Save new directory in local database