From: masensio <masensio@solidgear.es>
Date: Tue, 6 May 2014 11:22:59 +0000 (+0200)
Subject: Revert "Add mCursor to FileListListAdapter"
X-Git-Tag: oc-android-1.7.0_signed~309^2~50
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f119a13a30449803d35856c33814ed43a7b210d7?hp=--cc

Revert "Add mCursor to FileListListAdapter"

This reverts commit 85b6d7a9870ab0be7512e2a2852ffddb01f27cc0.

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

f119a13a30449803d35856c33814ed43a7b210d7
diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 21cfe0b4..9f7e0d74 100644
--- 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
  * 
  */
-public class FileListListAdapter extends SimpleCursorAdapter implements ListAdapter {
+public class FileListListAdapter extends SimpleCursorAdapter /*BaseAdapter*/ implements ListAdapter {
 
     private Context mContext;
     private static OCFile mFile = null;
     private Vector<OCFile> mFiles = null;
-    private static FileDataStorageManager mStorageManager;
+    private static FileDataStorageManager mStorageManager;
     private Account mAccount;
     private ComponentsGetter mTransferServiceGetter;
     
@@ -63,7 +63,7 @@ public class FileListListAdapter extends SimpleCursorAdapter implements ListAdap
         super(context, 0, null, null, null, 0);
         mContext = context;
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);
-        mTransferServiceGetter = componentsGetter;    }
+        mTransferServiceGetter = componentsGetter;    }
 
     @Override
     public boolean areAllItemsEnabled() {
@@ -211,10 +211,8 @@ public class FileListListAdapter extends SimpleCursorAdapter implements ListAdap
         }
         if (mStorageManager != null) {
             mFiles = mStorageManager.getFolderContent(mFile);
-            mCursor = mStorageManager.getContent(mFile.getParentId());
         } else {
             mFiles = null;
-            mCursor = null;
         }
         notifyDataSetChanged();
     }