some cleanup, closing cursors

diff --git a/src/eu/alefzero/owncloud/datamodel/OCFile.java b/src/eu/alefzero/owncloud/datamodel/OCFile.java
index bfa9963..57853c4 100644 (file)
--- a/src/eu/alefzero/owncloud/datamodel/OCFile.java
+++ b/src/eu/alefzero/owncloud/datamodel/OCFile.java
@@ -59,6 +59,7 @@ public class OCFile {
               path}, null);
       if (c.moveToFirst())
         new_file.setFileData(c);
               path}, null);
       if (c.moveToFirst())
         new_file.setFileData(c);

+      c.close();

     } catch (RemoteException e) {
       Log.e(TAG, e.getMessage());
     }
     } catch (RemoteException e) {
       Log.e(TAG, e.getMessage());
     }


@@ -69,7 +70,6 @@ public class OCFile {
     new_file.modified_timestamp_ = modified_timestamp;
     new_file.mimetype_ = mimetype;
     new_file.parent_id_ = parent_id;
     new_file.modified_timestamp_ = modified_timestamp;
     new_file.mimetype_ = mimetype;
     new_file.parent_id_ = parent_id;

-    Log.e(TAG, parent_id+"");

 
     return new_file;
   }
 
     return new_file;
   }


@@ -228,6 +228,7 @@ public class OCFile {
           ret.add(child);
         } while (c.moveToNext());
 
           ret.add(child);
         } while (c.moveToNext());
 

+      c.close();

       return ret;
     }
     return null;
       return ret;
     }
     return null;


@@ -244,12 +245,6 @@ public class OCFile {
     resetData();
   }
 
     resetData();
   }
 

-  private OCFile(ContentResolver cr, Account account) {
-    account_ = account;
-    cr_ = cr;
-    resetData();
-  }
-

   private void resetData() {
     id_ = -1;
     path_ = null;
   private void resetData() {
     id_ = -1;
     path_ = null;

diff --git a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
index ff1f818..b06ac53 100644 (file)
--- a/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
+++ b/src/eu/alefzero/owncloud/syncadapter/AbstractOwnCloudSyncAdapter.java
@@ -165,7 +165,7 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
        }
        
        private void parseResponse(HttpResponse resp, Uri uri, DefaultHttpClient client, HttpHost targetHost, LinkedList<TreeNode> insertList, boolean sf, long parent_id) throws IOException, OperationCanceledException, AuthenticatorException {
        }
        
        private void parseResponse(HttpResponse resp, Uri uri, DefaultHttpClient client, HttpHost targetHost, LinkedList<TreeNode> insertList, boolean sf, long parent_id) throws IOException, OperationCanceledException, AuthenticatorException {

-               boolean skipFirst = sf, override_parent = true;
+               boolean skipFirst = sf, override_parent = !sf;

                for (TreeNode n :WebdavUtils.parseResponseToNodes(resp.getEntity().getContent())) {\r
                  if (skipFirst) {\r
         skipFirst = false;\r
                for (TreeNode n :WebdavUtils.parseResponseToNodes(resp.getEntity().getContent())) {\r
                  if (skipFirst) {\r
         skipFirst = false;\r


@@ -181,9 +181,6 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
           n.getProperty(NodeProperty.RESOURCE_TYPE),\r
           parent_id);\r
                        new_file.save();\r
           n.getProperty(NodeProperty.RESOURCE_TYPE),\r
           parent_id);\r
                        new_file.save();\r

-                       Log.e("ASD", new_file.getFileId()+"");\r
-                       Log.e("ASD", new_file.getFileName()+"");\r
-                       Log.e("ASD", new_file.getPath()+"");\r

                        if (override_parent) {\r
                          parent_id = new_file.getFileId();\r
                          override_parent = false;\r
                        if (override_parent) {\r
                          parent_id = new_file.getFileId();\r
                          override_parent = false;\r

diff --git a/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java b/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java
index f29ebc0..2b912ee 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java
+++ b/src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java
@@ -22,13 +22,9 @@ import java.util.Vector;
 import eu.alefzero.owncloud.DisplayUtils;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r
 import eu.alefzero.owncloud.DisplayUtils;\r
 import eu.alefzero.owncloud.R;\r
 import eu.alefzero.owncloud.datamodel.OCFile;\r

-import eu.alefzero.owncloud.db.ProviderMeta;\r
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;\r

 \r
 import android.content.Context;\r
 \r
 import android.content.Context;\r

-import android.database.Cursor;\r

 import android.database.DataSetObserver;\r
 import android.database.DataSetObserver;\r

-import android.util.Log;\r

 import android.view.LayoutInflater;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
 import android.view.LayoutInflater;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r


@@ -64,7 +60,7 @@ public class FileListListAdapter implements ListAdapter {
 \r
   public int getCount() {\r
     // TODO Auto-generated method stub\r
 \r
   public int getCount() {\r
     // TODO Auto-generated method stub\r

-    return mFiles.size();\r
+    return mFiles != null ? mFiles.size() : 0;\r

   }\r
 \r
   public Object getItem(int position) {\r
   }\r
 \r
   public Object getItem(int position) {\r

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.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.content.Intent;\r

-import android.database.Cursor;\r
-import android.net.Uri;\r

 import android.os.Bundle;\r
 import android.os.Bundle;\r

-import android.util.Log;\r

 import android.view.View;\r
 import android.widget.AdapterView;\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.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
 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 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
   private Vector<OCFile> mFiles;\r
 \r
   public FileList() {\r
     mDirNames = new Stack<String>();\r

-    mParentsIds = new Stack<String>();\r

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


@@ -78,16 +70,14 @@ public class FileList extends FragmentListView {
         String dirname = file.getFileName();\r
 \r
         mDirNames.push(dirname);\r
         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
         ((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
     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
   }\r
 \r
   public void onBackPressed() {\r

-    mParentsIds.pop();\r

     mDirNames.pop();\r
     populateFileList();\r
   }\r
     mDirNames.pop();\r
     populateFileList();\r
   }\r