From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 12 Jul 2012 15:49:29 +0000 (+0200)
Subject: Avoid double query to the ContentResolver when listing the contents of a folder
X-Git-Tag: oc-android-1.4.3~282
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1dbc69dc1187de479ffee29bc134381e306a7fc7

Avoid double query to the ContentResolver when listing the contents of a folder
---

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 581d36b7..408d148f 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->
 <manifest package="eu.alefzero.owncloud"
     android:versionCode="1"
-    android:versionName="0.1.156B" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionName="0.1.157B" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
index 069a24d6..66d0af84 100644
--- a/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
@@ -43,8 +43,8 @@ public class FileListFragment extends FragmentListView {
     
     private FileListFragment.ContainerActivity mContainerActivity;
     
-    private Vector<OCFile> mFiles;    
     private OCFile mFile = null;
+    private FileListListAdapter mAdapter;
 
     
     /**
@@ -79,6 +79,7 @@ public class FileListFragment extends FragmentListView {
         Log.i(getClass().toString(), "onActivityCreated() start");
         
         super.onCreate(savedInstanceState);
+        //mAdapter = new FileListListAdapter();
         
         Log.i(getClass().toString(), "onActivityCreated() stop");
     }
@@ -86,21 +87,22 @@ public class FileListFragment extends FragmentListView {
     
     @Override
     public void onItemClick(AdapterView<?> l, View v, int position, long id) {
-        if (mFiles.size() <= position) {
-            throw new IndexOutOfBoundsException("Incorrect item selected");
-        }
-        OCFile file = mFiles.get(position);
-        
-        /// Click on a directory
-        if (file.getMimetype().equals("DIR")) {
-            // just local updates
-            mFile = file;
-            listDirectory(file);
-            // any other updates are let to the container Activity
-            mContainerActivity.onDirectoryClick(file);
+        OCFile file = (OCFile) mAdapter.getItem(position);
+        if (file != null) {
+            /// Click on a directory
+            if (file.getMimetype().equals("DIR")) {
+                // just local updates
+                mFile = file;
+                listDirectory(file);
+                // any other updates are let to the container Activity
+                mContainerActivity.onDirectoryClick(file);
+            
+            } else {    /// Click on a file
+                mContainerActivity.onFileClick(file);
+            }
             
-        } else {    /// Click on a file
-            mContainerActivity.onFileClick(file);
+        } else {
+            Log.d(TAG, "Null object in ListAdapter!!");
         }
         
     }
@@ -164,12 +166,9 @@ public class FileListFragment extends FragmentListView {
         }
 
         mFile = directory;
-        mFiles = storageManager.getDirectoryContent(directory);
         
-        /*if (mFiles == null || mFiles.size() == 0) {
-            Toast.makeText(getActivity(), "There are no files here", Toast.LENGTH_LONG).show();
-        }*/
-        setListAdapter(new FileListListAdapter(directory, storageManager, getActivity()));
+        mAdapter = new FileListListAdapter(directory, storageManager, getActivity());
+        setListAdapter(mAdapter);
     }