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 b6b099f..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.fileList, 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
@@ -200,7 +198,6 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
         public void onClick(DialogInterface dialog, int item) {\r
             mAccount = accMan.getAccountsByType(AccountAuthenticator.ACCOUNT_TYPE)[item];\r
             dialog.dismiss();\r
-            populateFileList();\r
         }\r
     });\r
     builder.setOnCancelListener(new OnCancelListener() {\r
@@ -346,35 +343,16 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
     //}\r
 //  }\r
   \r
-  private void populateFileList() {\r
-    if (mParents.empty()) {\r
-      mCursor = getContentResolver().query(ProviderTableMeta.CONTENT_URI,\r
-                                           null,\r
-                                           ProviderTableMeta.FILE_ACCOUNT_OWNER+"=?",\r
-                                           new String[]{mAccount.name},\r
-                                           null);\r
-    } else {\r
-      mCursor = getContentResolver().query(Uri.withAppendedPath(ProviderTableMeta.CONTENT_URI_DIR, mParents.peek()),\r
-                                           null,\r
-                                           ProviderTableMeta.FILE_ACCOUNT_OWNER + "=?",\r
-                                           new String[]{mAccount.name}, null);\r
-      if (!mIsDisplayingFile) {\r
-        //PathLayout pl = (PathLayout) findViewById(R.id.pathLayout1);\r
-        //for (String s : mPath) {\r
-        //  pl.push(s);\r
-       // }\r
-      }\r
-    }\r
+ \r
 //    setListAdapter(new FileListListAdapter(mCursor, this));\r
 //    getListView().invalidate();\r
-  }\r
 \r
   @Override\r
   public boolean onNavigationItemSelected(int itemPosition, long itemId) {\r
     int i = itemPosition;\r
     while (i-- != 0) {\r
       popPath();\r
-      mFileList.onBackPressed();\r
+      //mFileList.onBackPressed();\r
     }\r
     return true;\r
   }\r
@@ -382,10 +360,12 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
   @Override\r
   public void onBackPressed() {\r
     popPath();\r
-    if (mDirectories.isEmpty()) {\r
+    if (mDirectories.getCount() == 0)\r
+    {\r
       super.onBackPressed();\r
+      return;\r
     }\r
-    mFileList.onBackPressed();\r
+    ((FileList)getSupportFragmentManager().findFragmentById(id.file_list_container)).onBackPressed();\r
   }\r
   \r
   //@Override\r
@@ -400,5 +380,4 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
     outState.putSerializable("path", mPath);\r
     outState.putBoolean("isDisplayingFile", mIsDisplayingFile);\r
   }*/\r
-\r
 }
\ No newline at end of file