Revert "FileListListAdapter is a SimpleCursorAdapter"

This reverts commit 44dae87d2f5610108f87018dfa86e01cfc89c259.

Conflicts:
	src/com/owncloud/android/datamodel/FileDataStorageManager.java
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java

diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index 69e1d71..44d7820 100644 (file)
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -610,34 +610,6 @@ public class FileDataStorageManager {
     }
     
     
-    public Cursor getContent(long parentId) {
-        Log_OC.d(TAG, "getContent start");
-        Uri req_uri = Uri.withAppendedPath(
-                ProviderTableMeta.CONTENT_URI_DIR,
-                String.valueOf(parentId));
-        Cursor c = null;
-
-        if (getContentProviderClient() != null) {
-            try {
-                c = getContentProviderClient().query(req_uri, null, 
-                        ProviderTableMeta.FILE_PARENT + "=?" ,
-                        new String[] { String.valueOf(parentId)}, null);
-            } catch (RemoteException e) {
-                Log_OC.e(TAG, e.getMessage());
-                return c;
-            }
-        } else {
-            c = getContentResolver().query(req_uri, null, 
-                    ProviderTableMeta.FILE_PARENT + "=?" ,
-                    new String[] { String.valueOf(parentId)}, null);
-            
-            //c.setNotificationUri(getContentResolver(), req_uri);
-        }
-        
-        Log_OC.d(TAG, "getContent end");
-        return c;
-    }
-    
     private OCFile createRootDir() {
         OCFile file = new OCFile(OCFile.ROOT_PATH);
         file.setMimetype("DIR");
@@ -702,31 +674,31 @@ public class FileDataStorageManager {
         return c;
     }
     
-//    private Cursor getShareCursorForValue(String key, String value) {
-//        Cursor c = null;
-//        if (getContentResolver() != null) {
-//            c = getContentResolver()
-//                    .query(ProviderTableMeta.CONTENT_URI_SHARE,
-//                            null,
-//                            key + "=? AND "
-//                                    + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER
-//                                    + "=?",
-//                                    new String[] { value, mAccount.name }, null);
-//        } else {
-//            try {
-//                c = getContentProviderClient().query(
-//                        ProviderTableMeta.CONTENT_URI_SHARE,
-//                        null,
-//                        key + "=? AND " + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER
-//                        + "=?", new String[] { value, mAccount.name },
-//                        null);
-//            } catch (RemoteException e) {
-//                Log_OC.e(TAG, "Could not get file details: " + e.getMessage());
-//                c = null;
-//            }
-//        }
-//        return c;
-//    }
+    private Cursor getShareCursorForValue(String key, String value) {
+        Cursor c = null;
+        if (getContentResolver() != null) {
+            c = getContentResolver()
+                    .query(ProviderTableMeta.CONTENT_URI_SHARE,
+                            null,
+                            key + "=? AND "
+                                    + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER
+                                    + "=?",
+                                    new String[] { value, mAccount.name }, null);
+        } else {
+            try {
+                c = getContentProviderClient().query(
+                        ProviderTableMeta.CONTENT_URI_SHARE,
+                        null,
+                        key + "=? AND " + ProviderTableMeta.OCSHARES_ACCOUNT_OWNER
+                        + "=?", new String[] { value, mAccount.name },
+                        null);
+            } catch (RemoteException e) {
+                Log_OC.e(TAG, "Could not get file details: " + e.getMessage());
+                c = null;
+            }
+        }
+        return c;
+    }
 
     private OCFile createFileInstance(Cursor c) {
         OCFile file = null;

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 9f7e0d7..38ade7c 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -18,12 +18,11 @@
 package com.owncloud.android.ui.adapter;\r
 \r
 import android.accounts.Account;\r
-import android.content.Context;\r
-import android.support.v4.widget.SimpleCursorAdapter;\r
+import android.content.Context;
 import android.view.LayoutInflater;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
-//import android.widget.BaseAdapter;\r
+import android.widget.BaseAdapter;\r
 import android.widget.ImageView;\r
 import android.widget.ListAdapter;\r
 import android.widget.ListView;\r
@@ -49,21 +48,20 @@ import com.owncloud.android.utils.DisplayUtils;
  * @author Bartek Przybylski\r
  * \r
  */\r
-public class FileListListAdapter extends SimpleCursorAdapter /*BaseAdapter*/ implements ListAdapter {\r
-\r
+public class FileListListAdapter extends BaseAdapter implements ListAdapter {\r
     private Context mContext;\r
-    private static OCFile mFile = null;\r
+    private OCFile mFile = null;\r
     private Vector<OCFile> mFiles = null;\r
-    private static FileDataStorageManager mStorageManager;
+\r
+    private FileDataStorageManager mStorageManager;
     private Account mAccount;
     private ComponentsGetter mTransferServiceGetter;\r
-    
-\r
-    public FileListListAdapter(Context context, ComponentsGetter componentsGetter) {\r
-        super(context, 0, null, null, null, 0);\r
+    \r
+    public FileListListAdapter(Context context, ComponentsGetter transferServiceGetter) {\r
         mContext = context;\r
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r
-        mTransferServiceGetter = componentsGetter;    }
+        mTransferServiceGetter = transferServiceGetter;\r
+    }
 \r
     @Override\r
     public boolean areAllItemsEnabled() {\r

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 530a0d5..800eaf9 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -111,7 +111,6 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         Log_OC.e(TAG, "onActivityCreated() start");
-
         mAdapter = new FileListListAdapter(getSherlockActivity(), mContainerActivity); 
                 
         if (savedInstanceState != null) {
@@ -129,7 +128,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
             
         }
         
-        mAdapter = new FileListListAdapter(getActivity(), mContainerActivity);
+        mAdapter = new FileListListAdapter(getSherlockActivity(), mContainerActivity);
         
         setListAdapter(mAdapter);