proper file list handling, file basic stuff dispaying

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / ui / activity / FileDisplayActivity.java

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index f28cdd9..93d0ab7 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -86,7 +86,6 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
   private Cursor mCursor;\r
   private boolean mIsDisplayingFile;\r
   private ArrayAdapter<String> mDirectories;\r
-  private FileList mFileList;\r
  \r
   private static final int DIALOG_CHOOSE_ACCOUNT = 0;\r
   \r
@@ -105,14 +104,13 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
     super.onCreate(savedInstanceState);\r
     mDirectories = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_dropdown_item);\r
     mDirectories.add("/");\r
-    mFileList = new FileList();\r
     setContentView(R.layout.files);\r
     getActionBar().setNavigationMode(android.support.v4.app.ActionBar.NAVIGATION_MODE_LIST);\r
     getActionBar().setDisplayShowTitleEnabled(false);\r
     getActionBar().setListNavigationCallbacks(mDirectories, this);\r
     \r
     FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\r
-    ft.add(R.id.file_list_container, mFileList);\r
+    ft.add(R.id.file_list_container, new FileList());\r
     if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {\r
       ft.add(R.id.fileDetail, new FileDetail());\r
     }\r
@@ -362,9 +360,12 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
   @Override\r
   public void onBackPressed() {\r
     popPath();\r
-    //getSupportFragmentManager().popBackStack();\r
-    //super.onBackPressed();\r
-    getSupportFragmentManager().popBackStackImmediate();\r
+    if (mDirectories.getCount() == 0)\r
+    {\r
+      super.onBackPressed();\r
+      return;\r
+    }\r
+    ((FileList)getSupportFragmentManager().findFragmentById(id.file_list_container)).onBackPressed();\r
   }\r
   \r
   //@Override\r