some cleanup, closing cursors

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

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileList.java b/src/eu/alefzero/owncloud/ui/fragment/FileList.java
index 4b1c53b..6f3c4c5 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileList.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileList.java
@@ -23,19 +23,13 @@ import java.util.Vector;
 import android.accounts.Account;\r
 import android.accounts.AccountManager;\r
 import android.app.Service;\r
-import android.app.DownloadManager.Query;\r
 import android.content.Intent;\r
-import android.database.Cursor;\r
-import android.net.Uri;\r
 import android.os.Bundle;\r
-import android.util.Log;\r
 import android.view.View;\r
 import android.widget.AdapterView;\r
-import android.widget.TextView;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.authenticator.AccountAuthenticator;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r
 import eu.alefzero.owncloud.ui.FragmentListView;\r
 import eu.alefzero.owncloud.ui.activity.FileDetailActivity;\r
 import eu.alefzero.owncloud.ui.activity.FileDisplayActivity;\r
@@ -50,12 +44,10 @@ public class FileList extends FragmentListView {
   private Account mAccount;\r
   private AccountManager mAccountManager;\r
   private Stack<String> mDirNames;\r
-  private Stack<String> mParentsIds;\r
   private Vector<OCFile> mFiles;\r
 \r
   public FileList() {\r
     mDirNames = new Stack<String>();\r
-    mParentsIds = new Stack<String>();\r
   }\r
   \r
   @Override\r
@@ -78,16 +70,14 @@ public class FileList extends FragmentListView {
         String dirname = file.getFileName();\r
 \r
         mDirNames.push(dirname);\r
-        mParentsIds.push(id_);\r
         ((FileDisplayActivity)getActivity()).pushPath(dirname);\r
         \r
         populateFileList();\r
         return;\r
     }\r
     Intent i = new Intent(getActivity(), FileDetailActivity.class);\r
-    String filename = ((TextView)v.findViewById(R.id.Filename)).getText().toString();\r
-    i.putExtra("FILE_NAME", filename);\r
-    i.putExtra("FULL_PATH", "/" + filename);\r
+    i.putExtra("FILE_NAME", file.getFileName());\r
+    i.putExtra("FULL_PATH", file.getPath());\r
     i.putExtra("FILE_ID", id_);\r
     i.putExtra("ACCOUNT", mAccount);\r
     FileDetail fd = (FileDetail) getSupportFragmentManager().findFragmentById(R.id.fileDetail);\r
@@ -99,7 +89,6 @@ public class FileList extends FragmentListView {
   }\r
 \r
   public void onBackPressed() {\r
-    mParentsIds.pop();\r
     mDirNames.pop();\r
     populateFileList();\r
   }\r