bit better handling of filelist

[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..f28cdd9 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -112,7 +112,7 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
     getActionBar().setListNavigationCallbacks(mDirectories, this);\r
     \r
     FragmentTransaction ft = getSupportFragmentManager().beginTransaction();\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, mFileList);\r

     if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {\r
       ft.add(R.id.fileDetail, new FileDetail());\r
     }\r
     if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE) {\r
       ft.add(R.id.fileDetail, new FileDetail());\r
     }\r


@@ -200,7 +200,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
         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
         }\r
     });\r
     builder.setOnCancelListener(new OnCancelListener() {\r


@@ -346,35 +345,16 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
     //}\r
 //  }\r
   \r
     //}\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
 //    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
 \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
     }\r
     return true;\r
   }\r


@@ -382,10 +362,9 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
   @Override\r
   public void onBackPressed() {\r
     popPath();\r
   @Override\r
   public void onBackPressed() {\r
     popPath();\r

-    if (mDirectories.isEmpty()) {\r
-      super.onBackPressed();\r
-    }\r
-    mFileList.onBackPressed();\r
+    //getSupportFragmentManager().popBackStack();\r
+    //super.onBackPressed();\r
+    getSupportFragmentManager().popBackStackImmediate();\r

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


@@ -400,5 +379,4 @@ public class FileDisplayActivity extends android.support.v4.app.FragmentActivity
     outState.putSerializable("path", mPath);\r
     outState.putBoolean("isDisplayingFile", mIsDisplayingFile);\r
   }*/\r
     outState.putSerializable("path", mPath);\r
     outState.putBoolean("isDisplayingFile", mIsDisplayingFile);\r
   }*/\r

-\r

 }
\ No newline at end of file
 }
\ No newline at end of file