Add mCursor to FileListListAdapter

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 59be7b6..bb20094 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -51,7 +51,7 @@ import com.owncloud.android.utils.DisplayUtils;
  * @author Bartek Przybylski\r
  * \r
  */\r
  * @author Bartek Przybylski\r
  * \r
  */\r

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

 \r
     private Context mContext;\r
     private static OCFile mFile = null;\r
 \r
     private Context mContext;\r
     private static OCFile mFile = null;\r


@@ -59,6 +59,8 @@ public class FileListListAdapter extends SimpleCursorAdapter /*BaseAdapter*/ imp
     private static FileDataStorageManager mStorageManager;\r
     private Account mAccount;\r
     private TransferServiceGetter mTransferServiceGetter;\r
     private static FileDataStorageManager mStorageManager;\r
     private Account mAccount;\r
     private TransferServiceGetter mTransferServiceGetter;\r

+    private static Cursor mCursor = null;\r
+    \r

     private static String[] cursorFrom = { ProviderMeta.ProviderTableMeta.FILE_NAME,\r
         ProviderMeta.ProviderTableMeta.FILE_MODIFIED, \r
         ProviderMeta.ProviderTableMeta.FILE_CONTENT_LENGTH\r
     private static String[] cursorFrom = { ProviderMeta.ProviderTableMeta.FILE_NAME,\r
         ProviderMeta.ProviderTableMeta.FILE_MODIFIED, \r
         ProviderMeta.ProviderTableMeta.FILE_CONTENT_LENGTH\r


@@ -75,8 +77,8 @@ public class FileListListAdapter extends SimpleCursorAdapter /*BaseAdapter*/ imp
     \r
     public FileListListAdapter(Context context, TransferServiceGetter transferServiceGetter, OCFile file) {\r
         super(context,\r
     \r
     public FileListListAdapter(Context context, TransferServiceGetter transferServiceGetter, OCFile file) {\r
         super(context,\r

-                R.layout.list_item, \r
-                file == null ? null : mStorageManager.getContent(file.getParentId()),\r
+                R.layout.list_item,\r
+                mCursor,\r

                 cursorFrom,\r
                 cursorTo, \r
                 0);\r
                 cursorFrom,\r
                 cursorTo, \r
                 0);\r


@@ -84,6 +86,7 @@ public class FileListListAdapter extends SimpleCursorAdapter /*BaseAdapter*/ imp
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r
         mTransferServiceGetter = transferServiceGetter;\r
         mFile = file;\r
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r
         mTransferServiceGetter = transferServiceGetter;\r
         mFile = file;\r

+        mCursor = file == null ? null: mStorageManager.getContent(file.getParentId());\r

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


@@ -232,8 +235,10 @@ public class FileListListAdapter extends SimpleCursorAdapter /*BaseAdapter*/ imp
         }\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