some cleanup, closing cursors

src/eu/alefzero/owncloud/datamodel/OCFile.java

@@ -59,6 +59,7 @@ public class OCFile {
               path}, null);
       if (c.moveToFirst())
         new_file.setFileData(c);
+      c.close();
     } 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;
-    Log.e(TAG, parent_id+"");
 
     return new_file;
   }
@@ -228,6 +228,7 @@ public class OCFile {
           ret.add(child);
         } while (c.moveToNext());
 
+      c.close();
       return ret;
     }
     return null;
@@ -244,12 +245,6 @@ public class OCFile {
     resetData();
   }
 
-  private OCFile(ContentResolver cr, Account account) {
-    account_ = account;
-    cr_ = cr;
-    resetData();
-  }
-
   private void resetData() {
     id_ = -1;
     path_ = null;

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 {
-		boolean skipFirst = sf, override_parent = true;
+		boolean skipFirst = sf, override_parent = !sf;
 		for (TreeNode n :WebdavUtils.parseResponseToNodes(resp.getEntity().getContent())) {
 		  if (skipFirst) {
         skipFirst = false;
@@ -181,9 +181,6 @@ public abstract class AbstractOwnCloudSyncAdapter extends AbstractThreadedSyncAd
           n.getProperty(NodeProperty.RESOURCE_TYPE),
           parent_id);
 			new_file.save();
-			Log.e("ASD", new_file.getFileId()+"");
-			Log.e("ASD", new_file.getFileName()+"");
-			Log.e("ASD", new_file.getPath()+"");
 			if (override_parent) {
 			  parent_id = new_file.getFileId();
 			  override_parent = false;

src/eu/alefzero/owncloud/ui/adapter/FileListListAdapter.java

@@ -22,13 +22,9 @@ import java.util.Vector;
 import eu.alefzero.owncloud.DisplayUtils;
 import eu.alefzero.owncloud.R;
 import eu.alefzero.owncloud.datamodel.OCFile;
-import eu.alefzero.owncloud.db.ProviderMeta;
-import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta;
 
 import android.content.Context;
-import android.database.Cursor;
 import android.database.DataSetObserver;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -64,7 +60,7 @@ public class FileListListAdapter implements ListAdapter {
 
   public int getCount() {
     // TODO Auto-generated method stub
-    return mFiles.size();
+    return mFiles != null ? mFiles.size() : 0;
   }
 
   public Object getItem(int position) {

src/eu/alefzero/owncloud/ui/fragment/FileList.java

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