Directory creation fixed, navigating up from FileDetailsActivity now

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / fragment / FileListFragment.java

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
index 86c77c7..474416e 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
@@ -90,14 +90,10 @@ public class FileListFragment extends FragmentListView {
         \r
         // Update ActionBarPath\r
         if (file.getMimetype().equals("DIR")) {\r
-            String dirname = file.getFileName();\r
             mFile = file;\r
-            \r
-            ((FileDisplayActivity) getActivity()).pushPath(dirname);\r
-            \r
+            ((FileDisplayActivity) getActivity()).pushDirname(file);\r
             listDirectory(file);\r
             resetFileFragment();\r
-\r
             return;\r
         }\r
 \r
@@ -151,6 +147,15 @@ public class FileListFragment extends FragmentListView {
     }\r
 \r
     /**\r
+     * Use this to query the {@link OCFile} that is currently\r
+     * being displayed by this fragment\r
+     * @return The currently viewed OCFile\r
+     */\r
+    public OCFile getCurrentFile(){\r
+        return mFile;\r
+    }\r
+    \r
+    /**\r
      * Calls {@link FileListFragment#listDirectory(OCFile)} with a null parameter\r
      */\r
     public void listDirectory(){\r
@@ -175,11 +180,14 @@ public class FileListFragment extends FragmentListView {
             }\r
         }\r
         \r
+        \r
         // If that's not a directory -> List its parent\r
         if(!directory.isDirectory()){\r
             Log.w(TAG, "You see, that is not a directory -> " + directory.toString());\r
             directory = mStorageManager.getFileById(directory.getParentId());\r
         }\r
+\r
+        mFile = directory;\r
         \r
         mFiles = mStorageManager.getDirectoryContent(directory);\r
         if (mFiles == null || mFiles.size() == 0) {\r