Revert "Add mCursor to FileListListAdapter"

This reverts commit 85b6d7a9870ab0be7512e2a2852ffddb01f27cc0.

Conflicts:
	src/com/owncloud/android/ui/adapter/FileListListAdapter.java

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 21cfe0b..9f7e0d7 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -49,12 +49,12 @@ import com.owncloud.android.utils.DisplayUtils;
  * @author Bartek Przybylski\r
  * \r
  */\r
  * @author Bartek Przybylski\r
  * \r
  */\r

-public class FileListListAdapter extends SimpleCursorAdapter implements ListAdapter {\r
+public class FileListListAdapter extends SimpleCursorAdapter /*BaseAdapter*/ implements ListAdapter {\r

 \r
     private Context mContext;\r
     private static OCFile mFile = null;\r
     private Vector<OCFile> mFiles = null;\r
 \r
     private Context mContext;\r
     private static OCFile mFile = null;\r
     private Vector<OCFile> mFiles = null;\r

-    private static FileDataStorageManager mStorageManager;\r
+    private static FileDataStorageManager mStorageManager;

     private Account mAccount;
     private ComponentsGetter mTransferServiceGetter;\r
     
     private Account mAccount;
     private ComponentsGetter mTransferServiceGetter;\r
     


@@ -63,7 +63,7 @@ public class FileListListAdapter extends SimpleCursorAdapter implements ListAdap
         super(context, 0, null, null, null, 0);\r
         mContext = context;\r
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r
         super(context, 0, null, null, null, 0);\r
         mContext = context;\r
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r

-        mTransferServiceGetter = componentsGetter;    }\r
+        mTransferServiceGetter = componentsGetter;    }

 \r
     @Override\r
     public boolean areAllItemsEnabled() {\r
 \r
     @Override\r
     public boolean areAllItemsEnabled() {\r


@@ -211,10 +211,8 @@ public class FileListListAdapter extends SimpleCursorAdapter implements ListAdap
         }\r
         if (mStorageManager != null) {\r
             mFiles = mStorageManager.getFolderContent(mFile);\r
         }\r
         if (mStorageManager != null) {\r
             mFiles = mStorageManager.getFolderContent(mFile);\r

-            mCursor = mStorageManager.getContent(mFile.getParentId());\r

         } else {\r
             mFiles = null;\r
         } else {\r
             mFiles = null;\r

-            mCursor = null;\r

         }\r
         notifyDataSetChanged();\r
     }\r
         }\r
         notifyDataSetChanged();\r
     }\r