Revert "FileListListAdapter based in CursorAdapter instead of SimpleCursorAdapter...

This reverts commit 65c7d5d5baf3455d02b4a7d9352fcd42d939c669.

Conflicts:
	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 04f3271..69e1d71 100644 (file)
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -728,7 +728,7 @@ public class FileDataStorageManager {
 //        return c;
 //    }
 
 //        return c;
 //    }
 

-    public OCFile createFileInstance(Cursor c) {
+    private OCFile createFileInstance(Cursor c) {

         OCFile file = null;
         if (c != null) {
             file = new OCFile(c.getString(c
         OCFile file = null;
         if (c != null) {
             file = new OCFile(c.getString(c

diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 85597ef..21cfe0b 100644 (file)
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -19,17 +19,19 @@ package com.owncloud.android.ui.adapter;
 \r
 import android.accounts.Account;\r
 import android.content.Context;\r
 \r
 import android.accounts.Account;\r
 import android.content.Context;\r

-import android.database.Cursor;\r
-import android.support.v4.widget.CursorAdapter;\r
+import android.support.v4.widget.SimpleCursorAdapter;\r

 import android.view.LayoutInflater;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r
 import android.view.LayoutInflater;\r
 import android.view.View;\r
 import android.view.ViewGroup;\r

+//import android.widget.BaseAdapter;\r

 import android.widget.ImageView;\r
 import android.widget.ListAdapter;\r
 import android.widget.ListView;\r
 import android.widget.TextView;\r
 \r
 \r
 import android.widget.ImageView;\r
 import android.widget.ListAdapter;\r
 import android.widget.ListView;\r
 import android.widget.TextView;\r
 \r
 \r

+import java.util.Vector;\r
+\r

 import com.owncloud.android.R;\r
 import com.owncloud.android.authentication.AccountUtils;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r
 import com.owncloud.android.R;\r
 import com.owncloud.android.authentication.AccountUtils;\r
 import com.owncloud.android.datamodel.FileDataStorageManager;\r


@@ -38,7 +40,6 @@ import com.owncloud.android.files.services.FileDownloader.FileDownloaderBinder;
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
 import com.owncloud.android.ui.activity.ComponentsGetter;\r
 import com.owncloud.android.utils.DisplayUtils;\r
 import com.owncloud.android.files.services.FileUploader.FileUploaderBinder;\r
 import com.owncloud.android.ui.activity.ComponentsGetter;\r
 import com.owncloud.android.utils.DisplayUtils;\r

-import com.owncloud.android.utils.Log_OC;\r

 \r
 \r
 /**\r
 \r
 \r
 /**\r


@@ -48,24 +49,22 @@ import com.owncloud.android.utils.Log_OC;
  * @author Bartek Przybylski\r
  * \r
  */\r
  * @author Bartek Przybylski\r
  * \r
  */\r

-public class FileListListAdapter extends CursorAdapter implements ListAdapter {\r
+public class FileListListAdapter extends SimpleCursorAdapter implements ListAdapter {\r

 \r
 \r

-    private static final String TAG = FileListListAdapter.class.getSimpleName();\r
-    \r

     private Context mContext;\r
     private Context mContext;\r

-    private FileDataStorageManager mStorageManager;\r
-    private Account mAccount;\r
+    private static OCFile mFile = null;\r
+    private Vector<OCFile> mFiles = null;\r
+    private static FileDataStorageManager mStorageManager;\r
+    private Account mAccount;

     private ComponentsGetter mTransferServiceGetter;\r
     
 \r
     public FileListListAdapter(Context context, ComponentsGetter componentsGetter) {\r
     private ComponentsGetter mTransferServiceGetter;\r
     
 \r
     public FileListListAdapter(Context context, ComponentsGetter componentsGetter) {\r

-        super(context, null, 0);\r
+        super(context, 0, null, null, null, 0);\r

         mContext = context;\r
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r
         mContext = context;\r
         mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r

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

 \r
 \r

-    /*\r

     @Override\r
     public boolean areAllItemsEnabled() {\r
         return true;\r
     @Override\r
     public boolean areAllItemsEnabled() {\r
         return true;\r


@@ -99,7 +98,91 @@ public class FileListListAdapter extends CursorAdapter implements ListAdapter {
     public int getItemViewType(int position) {\r
         return 0;\r
     }\r
     public int getItemViewType(int position) {\r
         return 0;\r
     }\r

+\r
+    @Override\r
+    public View getView(int position, View convertView, ViewGroup parent) {\r
+        View view = convertView;\r
+        if (view == null) {\r
+            LayoutInflater inflator = (LayoutInflater) mContext\r
+                    .getSystemService(Context.LAYOUT_INFLATER_SERVICE);\r
+            view = inflator.inflate(R.layout.list_item, null);\r
+        }\r

     \r
     \r

+        if (mFiles != null && mFiles.size() > position) {\r
+            OCFile file = mFiles.get(position);\r
+            TextView fileName = (TextView) view.findViewById(R.id.Filename);\r
+            String name = file.getFileName();\r
+\r
+            fileName.setText(name);\r
+            ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);\r
+            fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype()));\r
+            ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);\r
+            FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();\r
+            FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();\r
+            if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {\r
+                localStateView.setImageResource(R.drawable.downloading_file_indicator);\r
+                localStateView.setVisibility(View.VISIBLE);\r
+            } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file)) {\r
+                localStateView.setImageResource(R.drawable.uploading_file_indicator);\r
+                localStateView.setVisibility(View.VISIBLE);\r
+            } else if (file.isDown()) {\r
+                localStateView.setImageResource(R.drawable.local_file_indicator);\r
+                localStateView.setVisibility(View.VISIBLE);\r
+            } else {\r
+                localStateView.setVisibility(View.INVISIBLE);\r
+            }\r
+            \r
+            TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);\r
+            TextView lastModV = (TextView) view.findViewById(R.id.last_mod);\r
+            ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);\r
+            \r
+            if (!file.isFolder()) {\r
+                fileSizeV.setVisibility(View.VISIBLE);\r
+                fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
+                lastModV.setVisibility(View.VISIBLE);\r
+                lastModV.setText(DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));\r
+                // this if-else is needed even thoe fav icon is visible by default\r
+                // because android reuses views in listview\r
+                if (!file.keepInSync()) {\r
+                    view.findViewById(R.id.imageView3).setVisibility(View.GONE);\r
+                } else {\r
+                    view.findViewById(R.id.imageView3).setVisibility(View.VISIBLE);\r
+                }\r
+                \r
+                ListView parentList = (ListView)parent;\r
+                if (parentList.getChoiceMode() == ListView.CHOICE_MODE_NONE) { \r
+                    checkBoxV.setVisibility(View.GONE);\r
+                } else {\r
+                    if (parentList.isItemChecked(position)) {\r
+                        checkBoxV.setImageResource(android.R.drawable.checkbox_on_background);\r
+                    } else {\r
+                        checkBoxV.setImageResource(android.R.drawable.checkbox_off_background);\r
+                    }\r
+                    checkBoxV.setVisibility(View.VISIBLE);\r
+                }\r
+                \r
+            } \r
+            else {\r
+                \r
+                fileSizeV.setVisibility(View.INVISIBLE);\r
+                //fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
+                lastModV.setVisibility(View.VISIBLE);\r
+                lastModV.setText(DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));\r
+                checkBoxV.setVisibility(View.GONE);\r
+                view.findViewById(R.id.imageView3).setVisibility(View.GONE);\r
+            }\r
+            \r
+            ImageView shareIconV = (ImageView) view.findViewById(R.id.shareIcon);\r
+            if (file.isShareByLink()) {\r
+                shareIconV.setVisibility(View.VISIBLE);\r
+            } else {\r
+                shareIconV.setVisibility(View.INVISIBLE);\r
+            }\r
+        }\r
+\r
+        return view;\r
+    }\r
+\r

     @Override\r
     public int getViewTypeCount() {\r
         return 1;\r
     @Override\r
     public int getViewTypeCount() {\r
         return 1;\r


@@ -114,118 +197,26 @@ public class FileListListAdapter extends CursorAdapter implements ListAdapter {
     public boolean isEmpty() {\r
         return (mFiles == null || mFiles.isEmpty());\r
     }\r
     public boolean isEmpty() {\r
         return (mFiles == null || mFiles.isEmpty());\r
     }\r

-    */\r

 \r
     /**\r
      * Change the adapted directory for a new one\r
 \r
     /**\r
      * Change the adapted directory for a new one\r

-     * @param folder                    New file to adapt. Can be NULL, meaning "no content to adapt".\r
+     * @param directory                 New file to adapt. Can be NULL, meaning "no content to adapt".\r

      * @param updatedStorageManager     Optional updated storage manager; used to replace mStorageManager if is different (and not NULL)\r
      */\r
      * @param updatedStorageManager     Optional updated storage manager; used to replace mStorageManager if is different (and not NULL)\r
      */\r

-    public void swapDirectory(OCFile folder, FileDataStorageManager updatedStorageManager) {\r
+    public void swapDirectory(OCFile directory, FileDataStorageManager updatedStorageManager) {\r
+        mFile = directory;\r

         if (updatedStorageManager != null && updatedStorageManager != mStorageManager) {\r
             mStorageManager = updatedStorageManager;\r
             mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r
         }\r
         if (updatedStorageManager != null && updatedStorageManager != mStorageManager) {\r
             mStorageManager = updatedStorageManager;\r
             mAccount = AccountUtils.getCurrentOwnCloudAccount(mContext);\r
         }\r

-        Cursor newCursor = null; \r

         if (mStorageManager != null) {\r
         if (mStorageManager != null) {\r

-            //mFiles = mStorageManager.getFolderContent(mFile);\r
-            newCursor = mStorageManager.getContent(folder.getFileId());\r
-        }\r
-        Cursor oldCursor = swapCursor(newCursor);\r
-        if (oldCursor != null){\r
-            oldCursor.close();\r
-        }\r
-        notifyDataSetChanged();\r
-    }\r
-\r
-    @Override\r
-    public void bindView(View view, Context context, Cursor cursor) {\r
-        Log_OC.d(TAG, "bindView start");\r
-        \r
-        OCFile file = mStorageManager.createFileInstance(cursor);\r
-        \r
-        TextView fileName = (TextView) view.findViewById(R.id.Filename);\r
-        String name = file.getFileName();\r
-\r
-        fileName.setText(name);\r
-        ImageView fileIcon = (ImageView) view.findViewById(R.id.imageView1);\r
-        fileIcon.setImageResource(DisplayUtils.getResourceId(file.getMimetype()));\r
-        ImageView localStateView = (ImageView) view.findViewById(R.id.imageView2);\r
-        FileDownloaderBinder downloaderBinder = mTransferServiceGetter.getFileDownloaderBinder();\r
-        FileUploaderBinder uploaderBinder = mTransferServiceGetter.getFileUploaderBinder();\r
-        if (downloaderBinder != null && downloaderBinder.isDownloading(mAccount, file)) {\r
-            localStateView.setImageResource(R.drawable.downloading_file_indicator);\r
-            localStateView.setVisibility(View.VISIBLE);\r
-        } else if (uploaderBinder != null && uploaderBinder.isUploading(mAccount, file)) {\r
-            localStateView.setImageResource(R.drawable.uploading_file_indicator);\r
-            localStateView.setVisibility(View.VISIBLE);\r
-        } else if (file.isDown()) {\r
-            localStateView.setImageResource(R.drawable.local_file_indicator);\r
-            localStateView.setVisibility(View.VISIBLE);\r
+            mFiles = mStorageManager.getFolderContent(mFile);\r
+            mCursor = mStorageManager.getContent(mFile.getParentId());\r

         } else {\r
         } else {\r

-            localStateView.setVisibility(View.INVISIBLE);\r
-        }\r
-        \r
-        TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);\r
-        TextView lastModV = (TextView) view.findViewById(R.id.last_mod);\r
-        ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);\r
-        \r
-        if (!file.isFolder()) {\r
-            fileSizeV.setVisibility(View.VISIBLE);\r
-            fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
-            lastModV.setVisibility(View.VISIBLE);\r
-            lastModV.setText(DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));\r
-            // this if-else is needed even thoe fav icon is visible by default\r
-            // because android reuses views in listview\r
-            if (!file.keepInSync()) {\r
-                view.findViewById(R.id.imageView3).setVisibility(View.GONE);\r
-            } else {\r
-                view.findViewById(R.id.imageView3).setVisibility(View.VISIBLE);\r
-            }\r
-            \r
-        } \r
-        else {\r
-            \r
-            fileSizeV.setVisibility(View.INVISIBLE);\r
-            //fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));\r
-            lastModV.setVisibility(View.VISIBLE);\r
-            lastModV.setText(DisplayUtils.unixTimeToHumanReadable(file.getModificationTimestamp()));\r
-            checkBoxV.setVisibility(View.GONE);\r
-            view.findViewById(R.id.imageView3).setVisibility(View.GONE);\r
+            mFiles = null;\r
+            mCursor = null;\r

         }\r
         }\r

-        \r
-        ImageView shareIconV = (ImageView) view.findViewById(R.id.shareIcon);\r
-        if (file.isShareByLink()) {\r
-            shareIconV.setVisibility(View.VISIBLE);\r
-        } else {\r
-            shareIconV.setVisibility(View.INVISIBLE);\r
-        }\r
-        //}\r
-        Log_OC.d(TAG, "bindView end");\r
-    }\r
-\r
-    @Override\r
-    public View newView(Context context, Cursor cursor, ViewGroup parent) {\r
-        Log_OC.d(TAG, "newView start");\r
-        LayoutInflater inflator = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);\r
-        View view = inflator.inflate(R.layout.list_item, null);\r
-        \r
-        // TODO check activity to upload\r
-        ListView parentList = (ListView) parent;\r
-        ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);\r
-        if (parentList.getChoiceMode() == ListView.CHOICE_MODE_NONE) { \r
-            checkBoxV.setVisibility(View.GONE);\r
-        } else {\r
-            /*if (parentList.isItemChecked(position)) {\r
-                checkBoxV.setImageResource(android.R.drawable.checkbox_on_background);\r
-            } else {\r
-                checkBoxV.setImageResource(android.R.drawable.checkbox_off_background);\r
-            }*/\r
-            checkBoxV.setVisibility(View.VISIBLE);\r
-        }\r
-        Log_OC.d(TAG, "newView end");\r
-        return view;\r
-      \r
+        notifyDataSetChanged();\r

     }\r
     \r
 }\r
     }\r
     \r
 }\r

diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
index 86aafeb..530a0d5 100644 (file)
--- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
+++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -39,7 +39,6 @@ import com.owncloud.android.utils.Log_OC;
 
 import android.accounts.Account;
 import android.app.Activity;
 
 import android.accounts.Account;
 import android.app.Activity;

-import android.database.Cursor;

 import android.os.Bundle;
 import android.view.ContextMenu;
 import android.view.MenuInflater;
 import android.os.Bundle;
 import android.view.ContextMenu;
 import android.view.MenuInflater;


@@ -130,6 +129,8 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
             
         }
         
             
         }
         

+        mAdapter = new FileListListAdapter(getActivity(), mContainerActivity);
+        

         setListAdapter(mAdapter);
         
         registerForContextMenu(getListView());
         setListAdapter(mAdapter);
         
         registerForContextMenu(getListView());


@@ -251,8 +252,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
     
     @Override
     public void onItemClick(AdapterView<?> l, View v, int position, long id) {
     
     @Override
     public void onItemClick(AdapterView<?> l, View v, int position, long id) {

-        OCFile file = mContainerActivity.getStorageManager().createFileInstance(
-                (Cursor) mAdapter.getItem(position));
+        OCFile file = (OCFile) mAdapter.getItem(position);

         if (file != null) {
             if (file.isFolder()) { 
                 // update state and view of this fragment
         if (file != null) {
             if (file.isFolder()) { 
                 // update state and view of this fragment


@@ -297,8 +297,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
         MenuInflater inflater = getSherlockActivity().getMenuInflater();
         inflater.inflate(R.menu.file_actions_menu, menu);
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
         MenuInflater inflater = getSherlockActivity().getMenuInflater();
         inflater.inflate(R.menu.file_actions_menu, menu);
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;

-        OCFile targetFile = mContainerActivity.getStorageManager().createFileInstance(
-                (Cursor) mAdapter.getItem(info.position));
+        OCFile targetFile = (OCFile) mAdapter.getItem(info.position);

         List<Integer> toHide = new ArrayList<Integer>();    
         List<Integer> toDisable = new ArrayList<Integer>();  
         
         List<Integer> toHide = new ArrayList<Integer>();    
         List<Integer> toDisable = new ArrayList<Integer>();  
         


@@ -383,8 +382,7 @@ public class OCFileListFragment extends ExtendedListFragment implements EditName
     @Override
     public boolean onContextItemSelected (MenuItem item) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();        
     @Override
     public boolean onContextItemSelected (MenuItem item) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();        

-        mTargetFile = mContainerActivity.getStorageManager().createFileInstance(
-                (Cursor) mAdapter.getItem(info.position));
+        mTargetFile = (OCFile) mAdapter.getItem(info.position);

         switch (item.getItemId()) {                
             case R.id.action_share_file: {
                 mContainerActivity.getFileOperationsHelper().shareFileWithLink(mTargetFile);
         switch (item.getItemId()) {                
             case R.id.action_share_file: {
                 mContainerActivity.getFileOperationsHelper().shareFileWithLink(mTargetFile);